Giorgos Tsiapaliwkas 77e5ff627c Merge branch 'plasma/terietorANDkokeroulis/KLocaleQMLBindings' ... Fix the git conflicts Conflicts: plasma/declarativeimports/CMakeLists.txt plasma/declarativeimports/test/contents/ui/Gallery.qml		2012-05-02 12:39:31 +03:00
..
core	Simplify QtGui module includes.	2012-04-10 00:22:13 +02:00
draganddrop	delegateImage property	2012-03-02 15:08:11 +01:00
graphicslayouts	use ${IMPORTS_INSTALL_DIR}	2010-10-18 19:20:08 +00:00
graphicswidgets	C++ standard mandates ends of line for includes. Fixes build with Sun Studio.	2010-11-02 23:43:31 +00:00
locale	Move declarativeimports/locale/test to declarativeimports/test and	2012-05-02 12:34:28 +03:00
plasmacomponents	ensire the switch is rendered correctly	2012-04-27 15:47:58 +02:00
plasmaextracomponents	Fix up installation -- no touch-specific installs	2012-04-03 17:51:01 +02:00
qtextracomponents	fix active effect	2012-05-01 14:46:19 +02:00
test	Merge branch 'plasma/terietorANDkokeroulis/KLocaleQMLBindings'	2012-05-02 12:39:31 +03:00
CMakeLists.txt	Merge branch 'plasma/terietorANDkokeroulis/KLocaleQMLBindings'	2012-05-02 12:39:31 +03:00