Marco Martin 8dfd8650ff Merge branch 'master' into plasma/declarative ...

Conflicts:
	plasma/declarativeimports/core/CMakeLists.txt
	plasma/declarativeimports/core/corebindingsplugin.cpp
	plasma/declarativeimports/plasmacomponents/BusyIndicator.qml
	plasma/declarativeimports/plasmacomponents/ScrollBar.qml
	plasma/declarativeimports/plasmacomponents/qmldir

2011-09-13 20:43:59 +02:00

..

dialogs

undo the shadpw removal

2011-05-02 13:51:00 +02:00

icons

:bug 261387

2010-12-27 20:03:12 +00:00

opaque

remove empty elements from last items

2010-12-13 13:46:29 +00:00

translucent

border slightly more transparent

2010-12-13 13:24:57 +00:00

widgets

Merge branch 'master' into plasma/declarative

2011-09-13 20:43:59 +02:00

CMakeLists.txt

install dialogs too

2010-04-02 17:11:13 +00:00

colors

move air to kdebase

2009-06-19 19:20:06 +00:00

metadata.desktop

SVN_SILENT made messages (.desktop file)

2011-09-09 09:21:00 +02:00