alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
1cf145861b
plasma-framework/examples
History
Marco Martin 12ea79b341 Merge branch 'mart/customShell' 
Conflicts:
	examples/CMakeLists.txt
	src/plasma/pluginloader.cpp
2016-03-08 15:38:31 +01:00
..
applets SVN_SILENT made messages (.desktop file) - always resolve ours 2016-02-06 09:49:14 +00:00
containments Merge branch 'mart/customShell' 2016-03-08 15:38:31 +01:00
dataengines SVN_SILENT made messages (.desktop file) - always resolve ours 2016-02-05 09:18:18 +00:00
developerguide SVN_SILENT made messages (.desktop file) - always resolve ours 2016-02-24 09:12:03 +00:00
kpart SVN_SILENT made messages (.desktop file) - always resolve ours 2016-02-02 10:51:53 +00:00
shell example without a wallpaper 2015-11-24 12:15:11 +01:00
testcontainmentactionsplugin SVN_SILENT made messages (.desktop file) - always resolve ours 2016-02-02 10:51:53 +00:00
wallpapers SVN_SILENT made messages (.desktop file) - always resolve ours 2016-02-02 10:51:53 +00: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