l10n daemon script 67a6976f8c 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-12-03 09:40:56 +00:00
..
cpp-plasmoid	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-12-03 09:40:56 +00:00
qml-plasmoid	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-12-03 09:40:56 +00:00
CMakeLists.txt	add a couple of plasmoid templates for kapptemplate/kdevelop	2015-11-30 15:02:43 +01:00