l10n daemon script a00f1f3ad4 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-21 13:24:50 +00:00
..
kwincompositing	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-04-21 13:24:50 +00:00
kwindecoration
kwindesktop
kwinoptions
kwinrules	Fix extraction of two messages in kcmkwinrules	2015-04-09 22:47:37 +03:00
kwinscreenedges
kwinscripts
kwintabbox
CMakeLists.txt