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
..
aurorae	Merge branch 'KDE/4.10'	2013-01-31 17:00:02 +01:00
b2	Mark most ctors as explicit as reported by Krazy2 checker	2013-01-02 18:35:46 +01:00
laptop	Add appmenu support to laptop kdecoration client	2013-01-07 14:07:11 +01:00
oxygen	i18n: contexts.	2013-01-13 10:56:07 +01:00
CMakeLists.txt
Messages.sh