l10n daemon script 226edf8b03 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"		2016-09-28 11:55:23 +00:00
..
CMakeLists.txt	Move backends/ to plugins/platforms/	2016-04-12 08:01:27 +02:00
egl_hwcomposer_backend.cpp	Support restarting the OpenGL compositor on Wayland	2016-07-20 14:08:23 +02:00
egl_hwcomposer_backend.h	Move backends/ to plugins/platforms/	2016-04-12 08:01:27 +02:00
hwcomposer.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-09-28 11:55:23 +00:00
hwcomposer_backend.cpp	[platforms/hwcomposer] Reset old brightness when turning screen back on	2016-08-17 16:47:37 +05:30
hwcomposer_backend.h	[platforms/hwcomposer] Set default old brightness to 50% (0x7f)	2016-08-18 17:59:07 +05:30
logging.cpp	Move backends/ to plugins/platforms/	2016-04-12 08:01:27 +02:00
logging.h	Move backends/ to plugins/platforms/	2016-04-12 08:01:27 +02:00
screens_hwcomposer.cpp	Move backends/ to plugins/platforms/	2016-04-12 08:01:27 +02:00
screens_hwcomposer.h	Move backends/ to plugins/platforms/	2016-04-12 08:01:27 +02:00