l10n daemon script bd10d78e1e 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-01-22 09:52:02 +00:00
..
applets	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-01-22 09:52:02 +00:00
containments	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-11-04 17:07:45 +00:00
dataengines	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-01-22 09:52:02 +00:00
developerguide	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-01-22 09:52:02 +00:00
kpart	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-11-04 17:07:45 +00:00
testcontainmentactionsplugin	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-12-30 09:28:22 +00:00
wallpapers	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-11-04 17:07:45 +00:00
CMakeLists.txt	Add basic plasmoid as example for developerguide	2015-12-03 02:45:04 +01:00
TODO	Port DataEngineTracker example,	2013-09-04 20:12:21 +05:30