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
..
kwincompositing	Merge branch 'KDE/4.10'	2013-01-31 17:00:02 +01:00
kwindecoration
kwindesktop	Merge branch 'KDE/4.10'	2013-01-31 17:00:02 +01:00
kwinoptions	Merge branch 'KDE/4.10'	2013-01-31 17:00:02 +01:00
kwinrules
kwinscreenedges	Merge branch 'KDE/4.10'	2013-01-31 17:00:02 +01:00
kwinscripts	Merge branch 'KDE/4.10'	2013-01-31 17:00:02 +01:00
kwintabbox
CMakeLists.txt