kwin/kcmkwin
l10n daemon script 2010bedb1e 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"
2016-04-25 10:26:42 +00:00
..
kwincompositing SVN_SILENT made messages (.desktop file) - always resolve ours 2016-04-25 10:26:42 +00:00
kwindecoration
kwindesktop Port to CMake AUTOMOC 2016-02-01 21:05:36 +01:00
kwinoptions
kwinrules
kwinscreenedges
kwinscripts
kwintabbox SVN_SILENT made messages (.desktop file) - always resolve ours 2016-01-10 11:46:53 +00:00
CMakeLists.txt