alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
1,525 Commits 1 Branch 0 Tags 40 MiB
3c56d80d52
Commit Graph

2 Commits

Author SHA1 Message Date
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
Giorgos Tsiapaliwkas
835cd63c72 Move declarativeimports/locale/test to declarativeimports/test and 
make the declarativeimports/test a plasmoid
 2012-05-02 12:34:28 +03:00