l10n daemon script df306a4062 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"		2017-02-28 12:58:59 +01: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	2017-02-28 12:58:59 +01:00
hwcomposer_backend.cpp	Fix typo	2017-01-02 20:13:30 +01:00
hwcomposer_backend.h	[platforms/hwcomposer] Support for hwcomposer 1.4 and 1.5 version	2016-12-16 09:22:48 +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