l10n daemon script db3ac9a536 SVN_SILENT made messages (.desktop file) - always resolve ours ... In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop"		2015-10-14 10:26:47 +00:00
..
CMakeLists.txt	Drop Android input handling	2015-10-14 08:13:37 +02:00
egl_hwcomposer_backend.cpp	Adjust to newer upstream libhybris version	2015-10-14 08:14:24 +02:00
egl_hwcomposer_backend.h
hwcomposer.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-10-14 10:26:47 +00:00
hwcomposer_backend.cpp	Adjust to newer upstream libhybris version	2015-10-14 08:14:24 +02:00
hwcomposer_backend.h	Adjust to newer upstream libhybris version	2015-10-14 08:14:24 +02:00
logging.cpp	Change default logging category to QtCriticalMsg	2015-07-31 13:29:58 +02:00
logging.h
screens_hwcomposer.cpp	[hwcomposer] Get refresh rate	2015-06-25 18:04:06 +02:00
screens_hwcomposer.h	[hwcomposer] Get refresh rate	2015-06-25 18:04:06 +02:00