merge in r568494 from trunk
author Luboš Luňák
()
committer Luboš Luňák
()
commit a4d80bc3fd7092e7b4bfccedbc690c7d8e5f3a5f
tree f8163234ae38b52f4a1d4a2376ec66514eec205e
parent 2cb8711b040c313c33b3bd30f714d4248c57222e
merge in r568494 from trunk


svn path=/branches/work/kwin_composite/; revision=590656
kwin/kwinbindings.cpp
kwin/workspace.h