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
..
contents/code	use Size instead of Scale animation	2013-01-30 13:07:22 +01:00
CMakeLists.txt
metadata.desktop	Merge branch 'KDE/4.10'	2013-01-31 17:00:02 +01:00