Diffusion KWin 8a95ac8dfb4e

Merge branch 'KDE/4.11'

Authored by luebking on Jan 29 2014, 7:28 PM.

Description

Merge branch 'KDE/4.11'

Conflicts:
kcontrol/workspaceoptions/workspaceoptions.desktop
kwin/sm.cpp

Merged Changes

CommitAuthorDetailsCommitted
ae9bff20b69aluebking
full repaints in logout effect 
Jan 29 2014
24138f7d04d1luebking
no autogrouping if deco doesn't support it 
Jan 29 2014
e716d8299376luebking
remove clientMachine from session handling 
Jan 29 2014
b712b5c038ccluebking
cut spurious \0 byte from string properties 
Jan 29 2014
30bcea073135luebking
1-pass change maximized <-> quicktiled geometry 
Jan 29 2014
17d833fa98cdluebking
merge buffer_age render into general render code 
Jan 29 2014