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
translucency.cpp
translucency.desktop	SVN_SILENT made messages (.desktop file)	2013-01-31 16:31:28 +01:00
translucency.h
translucency.kcfg
translucency_config.cpp
translucency_config.desktop	SVN_SILENT made messages (.desktop file)	2013-01-31 16:31:28 +01:00
translucency_config.h
translucency_config.ui
translucencyconfig.kcfgc