l10n daemon script 430ca2a33e 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 08:32:20 +02:00
..
CMakeLists.txt
egl_hwcomposer_backend.cpp
egl_hwcomposer_backend.h
hwcomposer.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-06-18 08:32:20 +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
logging.h
screens_hwcomposer.cpp
screens_hwcomposer.h