Merge branch 'KDE/4.11'
Conflicts:
kcontrol/workspaceoptions/workspaceoptions.desktop
kwin/sm.cpp
luebking | Jan 29 2014, 7:28 PM |
Commit | Author | Details | Committed | |||
---|---|---|---|---|---|---|
ae9bff20b69a | luebking | full repaints in logout effect | Jan 29 2014 | |||
24138f7d04d1 | luebking | no autogrouping if deco doesn't support it | Jan 29 2014 | |||
e716d8299376 | luebking | remove clientMachine from session handling | Jan 29 2014 | |||
b712b5c038cc | luebking | cut spurious \0 byte from string properties | Jan 29 2014 | |||
30bcea073135 | luebking | 1-pass change maximized <-> quicktiled geometry | Jan 29 2014 | |||
17d833fa98cd | luebking | merge buffer_age render into general render code | Jan 29 2014 |