Merge branch 'KDE/4.11'
bd2c8897681e
Actions

Authored by graesslin on Jan 28 2014, 7:18 AM.

Description

Merge branch 'KDE/4.11'

Conflicts:
kwin/egl_wayland_backend.cpp
kwin/eglonxbackend.cpp
kwin/glxbackend.cpp
kwin/scene_opengl.cpp
plasma/generic/wallpapers/color/plasma-wallpaper-color.desktop
plasma/generic/wallpapers/image/plasma-wallpaper-image.desktop

Details

Committed

graesslin

Jan 28 2014, 7:18 AM

Parents

R108:30aa92505ed8: Don't call into GL without a context
R108:657f15175ac3: Allow windows to specify that they should not get animated on window close

Branches

Unknown

Tags

Unknown

graesslin committed R108:bd2c8897681e: Merge branch 'KDE/4.11' (authored by graesslin).Jan 28 2014, 7:18 AM

Merged Changes

	Commit			Author	Details	Committed
	30aa92505ed8			James Jones/graesslin	Don't call into GL without a context	Jan 28 2014
	d1a1931f2e5e			l10n daemon script	SVN_SILENT made messages (.desktop file)	Jan 27 2014