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	Drop CompositingPrefs detection from screenedges kcm	2012-04-27 16:41:34 +02:00
kwinscreenedges.desktop	SVN_SILENT made messages (.desktop file)	2013-01-31 16:31:28 +01:00
main.cpp	Drop CompositingPrefs detection from screenedges kcm	2012-04-27 16:41:34 +02:00
main.h	Drop CompositingPrefs detection from screenedges kcm	2012-04-27 16:41:34 +02:00
main.ui	Less Krazy warnings please: QComboBox -> KComboBox	2010-08-06 21:35:39 +00:00
Messages.sh	Merged "active screen edges" and "active desktop borders" into a single	2009-02-27 15:40:53 +00:00
monitor.cpp	KWin uses kdelibs coding style.	2011-01-31 20:07:03 +01:00
monitor.h	Mark most ctors as explicit as reported by Krazy2 checker	2013-01-02 18:35:46 +01:00