alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
905 Commits 1 Branch 0 Tags 40 MiB
C++ 63.9%
QML 29.4%
CMake 3.3%
Shell 1.3%
Python 1%
Other 1%
e5b43a7357
Go to file
Marco Martin e5b43a7357 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
declarativeimports Merge branch 'master' into plasma/declarative 2011-09-13 20:43:59 +02:00
kpart SVN_SILENT made messages (.desktop file) 2011-09-09 09:21:00 +02:00
remotewidgetshelper SVN_SILENT made messages (.desktop file) 2011-09-09 09:21:00 +02:00
scriptengines SVN_SILENT made messages (.desktop file) 2011-09-09 09:21:00 +02:00
tools fix typo: remove->remote 2011-04-30 09:36:02 +03:00