Diffusion KWin 2791200cef97

Merge branch 'KDE/4.11'

Authored by luebking on Sep 25 2013, 9:21 PM.

Description

Merge branch 'KDE/4.11'

Conflicts:
kwin/eglonxbackend.cpp
kwin/glxbackend.cpp

Merged Changes

CommitAuthorDetailsCommitted
d1793e03a5d3luebking
fix scheduling the repaints 
Sep 25 2013
3c3da6f86dafluebking
keepInArea, client geometry containment condition 
Sep 25 2013
cab1b04b043aluebking
snap to deco, not client on inner screen borders 
Sep 25 2013
33880d61d639luebking
pack to client, not deco 
Sep 25 2013
599112713fdeluebking
add int Screens::intersecting(QRect) 
Sep 25 2013