Merge branch 'KDE/4.10'

Conflicts:
	nepomuk/kcm/kcm_nepomuk.desktop
This commit is contained in:
Marco Martin 2012-12-24 11:57:26 +01:00
commit 60f0b63f26

View File

@ -159,7 +159,7 @@ X-KDE-PluginInfo-License=GPL
X-KDE-PluginInfo-EnabledByDefault=true
[Wallpaper]
defaultWallpaperTheme=Ariya
defaultWallpaperTheme=Elarun
defaultFileSuffix=.png
defaultWidth=1920
defaultHeight=1200