Marco Martin baf21f6b34 Merge branch 'KDE/4.10' ... Conflicts: plasma/generic/applets/batterymonitor/metadata.desktop plasma/generic/applets/lock_logout/metadata.desktop		2013-01-31 17:00:02 +01:00
..
CMakeLists.txt
kwinscripts.desktop
kwinscripts.knsrc
main.cpp
Messages.sh
module.cpp
module.h
module.ui
version.h.cmake