You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
Marco Martin baf21f6b34 Merge branch 'KDE/4.10'
Conflicts:
	plasma/generic/applets/batterymonitor/metadata.desktop
	plasma/generic/applets/lock_logout/metadata.desktop
12 years ago
..
CMakeLists.txt
Messages.sh
kwinscripts.desktop
kwinscripts.knsrc
main.cpp
module.cpp
module.h
module.ui
version.h.cmake