alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
plasma-framework/examples
History
l10n daemon script e0a721c103 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-07-31 05:33:55 +02:00
..
applets
SVN_SILENT made messages (.desktop file) - always resolve ours
2020-07-31 05:33:55 +02:00
containments
SVN_SILENT made messages (.desktop file) - always resolve ours
2020-06-18 05:32:17 +02:00
dataengines
Use camelcase include. (scripted)
2020-07-08 07:44:43 +02:00
developerguide
SVN_SILENT made messages (.desktop file) - always resolve ours
2020-06-18 05:32:17 +02:00
shell
Use camelcase include. (scripted)
2020-07-08 07:44:43 +02:00
testcontainmentactionsplugin
SVN_SILENT made messages (.desktop file) - always resolve ours
2020-06-18 05:32:17 +02:00
wallpapers
SVN_SILENT made messages (.desktop file) - always resolve ours
2020-06-18 05:32:17 +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