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
..
Extras.qml	spacing improvements	2012-03-20 02:48:40 +01:00