l10n daemon script c10fe06d06 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"		2020-06-18 05:44:57 +02:00
..
CMakeLists.txt	Undo some recent cmake changes	2019-09-18 13:50:52 +03:00
egl_hwcomposer_backend.cpp	Revert "Remove vsync detection and configurability"	2020-01-16 10:00:12 +01: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	2020-06-18 05:44:57 +02:00
hwcomposer_backend.cpp	Port KWin to KWaylandServer	2020-04-30 12:56:08 +02:00
hwcomposer_backend.h	Port KWin to KWaylandServer	2020-04-30 12:56:08 +02:00
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	[platforms/hwcomposer] Port to AbstractOutput	2019-02-20 13:20:02 +00:00
screens_hwcomposer.h	[platforms/hwcomposer] Port to AbstractOutput	2019-02-20 13:20:02 +00:00