l10n daemon script 7c747e1591 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-04-24 09:53:59 +00:00
..
kwincompositing	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-04-21 13:24:50 +00:00
kwindecoration
kwindesktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-04-24 09:53:59 +00:00
kwinoptions
kwinrules	[kcmkwin/rules] Fix kdeinit_kwin_rules_dialog crashing on start	2015-04-23 09:36:31 +02:00
kwinscreenedges
kwinscripts
kwintabbox
CMakeLists.txt