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
..
contents/ui	Merge branch 'plasma/terietorANDkokeroulis/KLocaleQMLBindings'	2012-05-02 12:39:31 +03:00
gallery	Merge branch 'plasma/terietorANDkokeroulis/KLocaleQMLBindings'	2012-05-02 12:39:31 +03:00
AppTest.qml	remove green rectangle	2012-03-31 01:20:25 +02:00
metadata.desktop	Move declarativeimports/locale/test to declarativeimports/test and	2012-05-02 12:34:28 +03:00