Martin Gräßlin 5f887c36e3 Merge branch 'KDE/4.9' ... Conflicts: kwin/effects/flipswitch/flipswitch.cpp plasma/generic/applets/batterymonitor/metadata.desktop		2012-08-10 17:02:19 +02:00
..
CMakeLists.txt
flipswitch.cpp	Merge branch 'KDE/4.9'	2012-08-10 17:02:19 +02:00
flipswitch.desktop
flipswitch.h
flipswitch_config.cpp
flipswitch_config.desktop
flipswitch_config.h
flipswitch_config.ui