alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
666 Commits 1 Branch 0 Tags 40 MiB
C++ 63.9%
QML 29.4%
CMake 3.3%
Shell 1.3%
Python 1%
Other 1%
8dfd8650ff
Go to file
Marco Martin 8dfd8650ff Merge branch 'master' into plasma/declarative 
Conflicts:
	plasma/declarativeimports/core/CMakeLists.txt
	plasma/declarativeimports/core/corebindingsplugin.cpp
	plasma/declarativeimports/plasmacomponents/BusyIndicator.qml
	plasma/declarativeimports/plasmacomponents/ScrollBar.qml
	plasma/declarativeimports/plasmacomponents/qmldir
2011-09-13 20:43:59 +02:00
air Merge branch 'master' into plasma/declarative 2011-09-13 20:43:59 +02:00
appdashboard SVN_SILENT made messages (.desktop file) 2011-09-13 15:53:03 +02:00
oxygen SVN_SILENT made messages (.desktop file) 2011-09-13 15:53:03 +02:00
CMakeLists.txt build appdashboard 2011-02-03 22:02:13 +01:00