l10n daemon script 344650fe5d 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-06-21 10:41:58 +00:00
..
kwincompositing	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-06-21 10:41:58 +00:00
kwindecoration	Add an explicit dependency to Breeze to find decoration plugin	2016-04-12 08:54:50 +02:00
kwindesktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-05-31 11:06:54 +00:00
kwinoptions	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-05-31 11:06:54 +00:00
kwinrules	[Rules Widget] Change decoration fallback color from "Oxygen" to "Breeze"	2016-05-12 10:34:14 +02:00
kwinscreenedges	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-05-31 11:06:54 +00:00
kwinscripts	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-05-31 11:06:54 +00:00
kwintabbox	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-05-31 11:06:54 +00:00
CMakeLists.txt