l10n daemon script 43f575b415 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-12-13 07:01:42 +01:00
..
CMakeLists.txt	Move SceneOpenGL into a dedicated plugin	2017-09-30 13:12:10 +02:00
egl_hwcomposer_backend.cpp	Move SceneOpenGL into a dedicated plugin	2017-09-30 13:12:10 +02:00
egl_hwcomposer_backend.h	Move SceneOpenGL into a dedicated plugin	2017-09-30 13:12:10 +02:00
hwcomposer.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-12-13 07:01:42 +01:00
hwcomposer_backend.cpp	[platforms/hwcomposer] Set value of surfaceDamage.numRects to 0	2017-11-02 10:21:37 +05:30
hwcomposer_backend.h	[platforms/hwcomposer] Make createOutput a non-static method	2017-10-23 13:42:26 +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	Add physicalSize to the Screens API	2017-10-19 18:02:32 +02:00
screens_hwcomposer.h	Add physicalSize to the Screens API	2017-10-19 18:02:32 +02:00