Merge branch 'KDE/4.10'
28af24f57d06
Actions

Authored by xuetianweng on Dec 24 2012, 4:27 AM.

Description

Merge branch 'KDE/4.10'

Details

Committed

xuetianweng

Dec 24 2012, 4:27 AM

Parents

R108:6bb80e94c325: SVN_SILENT made messages (.desktop file)
R108:dd43acb76873: Merge branch 'KDE/4.10'

Branches

Unknown

Tags

Unknown

xuetianweng committed R108:28af24f57d06: Merge branch 'KDE/4.10' (authored by xuetianweng).Dec 24 2012, 4:27 AM

Merged Changes

	Commit			Author	Details	Committed
	6bb80e94c325			Script Kiddy	SVN_SILENT made messages (.desktop file)	Dec 23 2012

Changes (103)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

				Path	Packages
	M			clients/aurorae/src/aurorae.desktop
	M			clients/aurorae/themes/plastik/package/metadata.desktop
	M			clients/b2/b2.desktop
	M			clients/laptop/laptop.desktop
	M			clients/oxygen/oxygenclient.desktop
	M			data/fsp_workarounds_1.kwinrules
	M			effects/blur/blur.desktop
	M			effects/blur/blur_config.desktop
	M			effects/boxswitch/boxswitch.desktop
	M			effects/boxswitch/boxswitch_config.desktop
	M			effects/coverswitch/coverswitch.desktop
	M			effects/coverswitch/coverswitch_config.desktop
	M			effects/cube/cube.desktop
	M			effects/cube/cube_config.desktop
	M			effects/cube/cubeslide.desktop
	M			effects/cube/cubeslide_config.desktop
	M			effects/dashboard/dashboard.desktop
	M			effects/dashboard/dashboard_config.desktop
	M			effects/desktopgrid/desktopgrid.desktop
	M			effects/desktopgrid/desktopgrid_config.desktop
	M			effects/dialogparent/dialogparent.desktop
	M			effects/diminactive/diminactive.desktop
	M			effects/diminactive/diminactive_config.desktop
	M			effects/dimscreen/dimscreen.desktop
	M			effects/explosion/explosion.desktop
	M			effects/fade/package/metadata.desktop
	M			effects/fadedesktop/package/metadata.desktop
	M			effects/fallapart/fallapart.desktop
	M			effects/flipswitch/flipswitch.desktop
	M			effects/flipswitch/flipswitch_config.desktop
	M			effects/glide/glide.desktop
	M			effects/glide/glide_config.desktop
	M			effects/highlightwindow/highlightwindow.desktop
	M			effects/invert/invert.desktop
	M			effects/invert/invert_config.desktop
	M			effects/kwineffect.desktop
	M			effects/login/login.desktop
	M			effects/login/login_config.desktop
	M			effects/logout/logout.desktop
	M			effects/lookingglass/lookingglass.desktop
	M			effects/lookingglass/lookingglass_config.desktop
	M			effects/magiclamp/magiclamp.desktop
	M			effects/magiclamp/magiclamp_config.desktop
	M			effects/magnifier/magnifier.desktop
	M			effects/magnifier/magnifier_config.desktop
	M			effects/minimizeanimation/minimizeanimation.desktop
	M			effects/mousemark/mousemark.desktop
	M			effects/mousemark/mousemark_config.desktop
	M			effects/outline/outline.desktop
	M			effects/presentwindows/presentwindows.desktop
	M			effects/presentwindows/presentwindows_config.desktop
	M			effects/resize/resize.desktop
	M			effects/resize/resize_config.desktop
	M			effects/scalein/scalein.desktop
	M			effects/screenshot/screenshot.desktop
	M			effects/sheet/sheet.desktop
	M			effects/showfps/showfps.desktop
	M			effects/showfps/showfps_config.desktop
	M			effects/showpaint/showpaint.desktop
	M			effects/slide/slide.desktop
	M			effects/slideback/slideback.desktop
	M			effects/slidingpopups/slidingpopups.desktop
	M			effects/snaphelper/snaphelper.desktop
	M			effects/startupfeedback/startupfeedback.desktop
	M			effects/taskbarthumbnail/taskbarthumbnail.desktop
	M			effects/thumbnailaside/thumbnailaside.desktop
	M			effects/thumbnailaside/thumbnailaside_config.desktop
	M			effects/trackmouse/trackmouse.desktop
	M			effects/trackmouse/trackmouse_config.desktop
	M			effects/translucency/translucency.desktop
	M			effects/translucency/translucency_config.desktop
	M			effects/windowgeometry/windowgeometry.desktop
	M			effects/windowgeometry/windowgeometry_config.desktop
	M			effects/wobblywindows/wobblywindows.desktop
	M			effects/wobblywindows/wobblywindows_config.desktop
	M			effects/zoom/zoom.desktop
	M			effects/zoom/zoom_config.desktop
	M			kcmkwin/kwincompositing/kwincompositing.desktop
	M			kcmkwin/kwindecoration/kwindecoration.desktop
	M			kcmkwin/kwindesktop/desktop.desktop
	M			kcmkwin/kwinoptions/kwinactions.desktop
	M			kcmkwin/kwinoptions/kwinadvanced.desktop
	M			kcmkwin/kwinoptions/kwinfocus.desktop
	M			kcmkwin/kwinoptions/kwinmoving.desktop
	M			kcmkwin/kwinoptions/kwinoptions.desktop
	M			kcmkwin/kwinrules/kwinrules.desktop
	M			kcmkwin/kwinscreenedges/kwinscreenedges.desktop
	M			kcmkwin/kwinscripts/kwinscripts.desktop
	M			kcmkwin/kwintabbox/kwintabbox.desktop
	M			kwin.notifyrc
	M			scripting/kwinscript.desktop
	M			scripts/desktopchangeosd/metadata.desktop
	M			scripts/synchronizeskipswitcher/metadata.desktop
	M			scripts/videowall/metadata.desktop
	M			tabbox/kwinwindowswitcher.desktop
	M			tabbox/qml/clients/big_icons/metadata.desktop
	M			tabbox/qml/clients/compact/metadata.desktop
	M			tabbox/qml/clients/informative/metadata.desktop
	M			tabbox/qml/clients/present_windows/metadata.desktop
	M			tabbox/qml/clients/small_icons/metadata.desktop
	M			tabbox/qml/clients/text/metadata.desktop
	M			tabbox/qml/clients/thumbnails/metadata.desktop
	M			tabbox/qml/clients/window_strip/metadata.desktop