kwin/kcmkwin
l10n daemon script 7d8fcbfd72 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"
2015-11-12 11:51:31 +00:00
..
kwincompositing SVN_SILENT made messages (.desktop file) - always resolve ours 2015-11-12 11:51:31 +00:00
kwindecoration SVN_SILENT made messages (.desktop file) - always resolve ours 2015-11-04 17:27:21 +00:00
kwindesktop SVN_SILENT made messages (.desktop file) - always resolve ours 2015-11-04 17:27:21 +00:00
kwinoptions SVN_SILENT made messages (.desktop file) - always resolve ours 2015-11-07 21:21:42 +00:00
kwinrules SVN_SILENT made messages (.desktop file) - always resolve ours 2015-11-07 21:21:42 +00:00
kwinscreenedges SVN_SILENT made messages (.desktop file) - always resolve ours 2015-11-07 21:21:42 +00:00
kwinscripts SVN_SILENT made messages (.desktop file) - always resolve ours 2015-11-04 17:27:21 +00:00
kwintabbox optimize string operations 2015-11-05 14:14:06 +00:00
CMakeLists.txt Drop build option KWIN_BUILD_SCREENEDGES 2014-11-24 10:48:49 +01:00