kwin/kcmkwin
l10n daemon script 1f8e4bba85 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"
2019-11-20 05:46:13 +01:00
..
common
kwincompositing Remove vsync detection and configurability 2019-11-14 08:55:08 +01:00
kwindecoration SVN_SILENT made messages (.desktop file) - always resolve ours 2019-11-19 05:39:12 +01:00
kwindesktop SVN_SILENT made messages (.desktop file) - always resolve ours 2019-11-02 05:41:14 +01:00
kwineffects SVN_SILENT made messages (.desktop file) - always resolve ours 2019-11-03 05:21:29 +01:00
kwinoptions SVN_SILENT made messages (.desktop file) - always resolve ours 2019-11-20 05:46:13 +01:00
kwinrules Add some const & 2019-10-30 19:23:01 +01:00
kwinscreenedges Remove some unused includes 2019-11-10 20:26:35 +01:00
kwinscripts SVN_SILENT made messages (.desktop file) - always resolve ours 2019-11-02 05:41:14 +01:00
kwintabbox Remove some unused includes 2019-11-10 20:26:35 +01:00
CMakeLists.txt