l10n daemon script bba40b9b9d 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"		2017-02-05 06:07:10 +01:00
..
applets	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-02-05 06:07:10 +01:00
containments	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-12-20 12:53:44 +01:00
dataengines	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-02-05 06:07:10 +01:00
developerguide	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-02-05 06:07:10 +01:00
shell	example without a wallpaper	2015-11-24 12:15:11 +01:00
testcontainmentactionsplugin	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-02-05 06:07:10 +01:00
wallpapers	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-02-05 06:07:10 +01:00
CMakeLists.txt	Merge branch 'mart/customShell'	2016-03-08 15:38:31 +01:00
TODO	Port DataEngineTracker example,	2013-09-04 20:12:21 +05:30