kwin/plugins/platforms
l10n daemon script 91abcdbcfa 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-02-17 05:51:10 +01:00
..
drm SVN_SILENT made messages (.desktop file) - always resolve ours 2020-02-17 05:51:10 +01:00
fbdev SVN_SILENT made messages (.desktop file) - always resolve ours 2020-02-17 05:51:10 +01:00
hwcomposer Revert "Remove vsync detection and configurability" 2020-01-16 10:00:12 +01:00
virtual SVN_SILENT made messages (.desktop file) - always resolve ours 2020-02-17 05:51:10 +01:00
wayland SVN_SILENT made messages (.desktop file) - always resolve ours 2020-02-17 05:51:10 +01:00
x11 ScreenEdge: Do not use localtime for measuring duration 2020-02-03 12:26:17 +01:00
CMakeLists.txt Cleanup style in CMakeLists.txt files 2019-09-17 16:03:05 +03:00