l10n daemon script c331b3f825 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-05-16 10:31:39 +00:00
..
kwincompositing	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-05-16 10:31:39 +00:00
kwindecoration	Add an explicit dependency to Breeze to find decoration plugin	2016-04-12 08:54:50 +02:00
kwindesktop	Port to CMake AUTOMOC	2016-02-01 21:05:36 +01:00
kwinoptions	Port to CMake AUTOMOC	2016-02-01 21:05:36 +01:00
kwinrules	[Rules Widget] Change decoration fallback color from "Oxygen" to "Breeze"	2016-05-12 10:34:14 +02:00
kwinscreenedges	Add KRunner and Activity Manager screen edge	2016-05-08 16:53:48 +02:00
kwinscripts	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-01-30 09:40:55 +00:00
kwintabbox	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-01-10 11:46:53 +00:00
CMakeLists.txt