plasma-framework/examples/applets
Marco Martin 3858044d25 Merge branch 'mart/AppletAttached'
Conflicts:
	src/declarativeimports/core/dialog.cpp
	src/scriptengines/qml/plasmoid/containmentinterface.cpp
2014-02-06 13:16:11 +01:00
..
compactrepresentation Merge branch 'mart/AppletAttached' 2014-02-06 13:16:11 +01:00
conditionalloader Merge branch 'mart/AppletAttached' 2014-02-06 13:16:11 +01:00
config Merge branch 'mart/AppletAttached' 2014-02-06 13:16:11 +01:00
dataenginemodel Merge branch 'mart/AppletAttached' 2014-02-06 13:16:11 +01:00
helloworld Merge branch 'mart/AppletAttached' 2014-02-06 13:16:11 +01:00
notes Merge branch 'mart/AppletAttached' 2014-02-06 13:16:11 +01:00
nowplaying SVN_SILENT made messages (.desktop file) 2014-02-01 04:10:47 +00:00
pairsgame/contents/ui add 3 example plasmoids to be ported 2013-09-04 11:57:46 +02:00
qmltasks Merge branch 'mart/AppletAttached' 2014-02-06 13:16:11 +01:00
samegame SVN_SILENT made messages (.desktop file) 2014-02-01 04:10:47 +00:00
testcomponents Merge branch 'mart/AppletAttached' 2014-02-06 13:16:11 +01:00
testshaders Merge branch 'mart/AppletAttached' 2014-02-06 13:16:11 +01:00
testtheme Merge branch 'mart/AppletAttached' 2014-02-06 13:16:11 +01:00
widgetgallery Merge branch 'mart/AppletAttached' 2014-02-06 13:16:11 +01:00
windowthumbnails Merge branch 'mart/AppletAttached' 2014-02-06 13:16:11 +01:00
CMakeLists.txt Small applet to test especialy the theme's sizing and DPI 2014-01-21 00:59:59 +01:00