Fix merge issues
authorCédric Bellegarde <gnumdk@gmail.com>
Mon, 3 Sep 2012 12:04:51 +0000 (12:04 +0000)
committerCédric Bellegarde <gnumdk@gmail.com>
Mon, 3 Sep 2012 12:04:51 +0000 (12:04 +0000)
commitc493072233c21af71442b11beab99dfda679055f
tree13c1e905f3796d6c9b8467549f062a4e92ec5b0f
parent8f856f8144b37e95fdca19e68d0215b9ff98c966
parentae0a8a671a7f12632d3576130fc7c8e7a4f437a2
Fix merge issues
kwin/bridge.cpp
kwin/client.cpp
kwin/client.h
kwin/clients/oxygen/oxygenclient.cpp
kwin/libkdecorations/kcommondecoration.cpp
kwin/useractions.cpp
kwin/workspace.cpp
kwin/workspace.h