alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
3c56d80d52
plasma-framework/declarativeimports/test/contents/ui
History
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
..
Busy.qml Merge branch 'plasma/terietorANDkokeroulis/KLocaleQMLBindings' 2012-05-02 12:39:31 +03:00
Buttons.qml Merge branch 'plasma/terietorANDkokeroulis/KLocaleQMLBindings' 2012-05-02 12:39:31 +03:00
CheckableButtons.qml Merge branch 'plasma/terietorANDkokeroulis/KLocaleQMLBindings' 2012-05-02 12:39:31 +03:00
Gallery.qml Merge branch 'plasma/terietorANDkokeroulis/KLocaleQMLBindings' 2012-05-02 12:39:31 +03:00
Locale.qml Move declarativeimports/locale/test to declarativeimports/test and 2012-05-02 12:34:28 +03:00
Misc.qml Move declarativeimports/locale/test to declarativeimports/test and 2012-05-02 12:34:28 +03:00
Scrollers.qml Merge branch 'plasma/terietorANDkokeroulis/KLocaleQMLBindings' 2012-05-02 12:39:31 +03:00
Sliders.qml Merge branch 'plasma/terietorANDkokeroulis/KLocaleQMLBindings' 2012-05-02 12:39:31 +03:00
TextEditing.qml Merge branch 'plasma/terietorANDkokeroulis/KLocaleQMLBindings' 2012-05-02 12:39:31 +03:00
Texts.qml Merge branch 'plasma/terietorANDkokeroulis/KLocaleQMLBindings' 2012-05-02 12:39:31 +03:00