alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
694131fdb6
plasma-framework/examples
History
l10n daemon script 4519c25d5c 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"
2015-11-10 12:46:43 +00:00
..
applets SVN_SILENT made messages (.desktop file) - always resolve ours 2015-11-10 12:46:43 +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 2015-11-04 17:07:45 +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-11-04 17:07:45 +00:00
wallpapers SVN_SILENT made messages (.desktop file) - always resolve ours 2015-11-04 17:07:45 +00:00
CMakeLists.txt Use ${KF5_DEP_VERSION} for dependencies in examples/ 2014-06-01 11:32:59 +01:00
TODO Port DataEngineTracker example, 2013-09-04 20:12:21 +05:30