plasma-framework/examples
l10n daemon script f7743ade92 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"
2020-12-10 06:24:39 +01:00
..
applets SVN_SILENT made messages (.desktop file) - always resolve ours 2020-12-10 06:24:39 +01:00
containments SVN_SILENT made messages (.desktop file) - always resolve ours 2020-09-28 05:58:18 +02:00
dataengines SVN_SILENT made messages (.desktop file) - always resolve ours 2020-09-28 05:58:18 +02:00
developerguide SVN_SILENT made messages (.desktop file) - always resolve ours 2020-09-28 05:58:18 +02:00
shell plasma-framework: Convert copyright statements to SPDX expressions 2020-08-13 19:08:54 +00:00
testcontainmentactionsplugin SVN_SILENT made messages (.desktop file) - always resolve ours 2020-09-08 06:34:57 +02:00
wallpapers SVN_SILENT made messages (.desktop file) - always resolve ours 2020-09-08 06:34:57 +02: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