l10n daemon script 93034e04cf 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-04-20 09:37:30 +00:00
..
idletime	[wayland] Fix heap-use-after-free in idle time plugin	2016-02-02 12:00:12 +01:00
kdecorations	Move clients/ to plugins/kdecorations/	2016-04-15 15:21:03 +02:00
kglobalaccel	[globalaccel] Ensure we don't call into deleted InputRedirection on shutdown	2015-10-05 14:47:15 +02:00
platforms	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-04-20 09:37:30 +00:00
qpa	Rename abstract_backend.(h|cpp) to platform.(h|cpp)	2016-04-07 16:18:12 +02:00
CMakeLists.txt	Move clients/ to plugins/kdecorations/	2016-04-15 15:21:03 +02:00