plasma-framework/examples/developerguide
l10n daemon script e2edaa2c1a 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-04-25 10:23:50 +00:00
..
basic SVN_SILENT made messages (.desktop file) - always resolve ours 2016-04-25 10:23:50 +00:00
CMakeLists.txt Don't install plasmoid for now 2015-12-03 02:45:04 +01:00