plasma-framework/examples
l10n daemon script f1ec1433c8 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"
2018-12-24 05:20:13 +01:00
..
applets SVN_SILENT made messages (.desktop file) - always resolve ours 2018-12-24 05:20:13 +01:00
containments SVN_SILENT made messages (.desktop file) - always resolve ours 2018-09-08 06:12:26 +02:00
dataengines SVN_SILENT made messages (.desktop file) - always resolve ours 2018-09-08 06:12:26 +02:00
developerguide SVN_SILENT made messages (.desktop file) - always resolve ours 2018-10-15 05:39:14 +02:00
shell [Examples] Fix build 2018-01-26 15:48:27 +01:00
testcontainmentactionsplugin SVN_SILENT made messages (.desktop file) - always resolve ours 2018-10-10 06:27:59 +02:00
wallpapers Remove long-time deprecated Encoding=UTF-8 from example desktop files 2018-03-10 02:18:22 +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