Martin Gräßlin 9291b18cee Merge branch 'master' into frameworks-scratch ... Conflicts: CMakeLists.txt kwin/effects.cpp kwin/effects/logout/logout.cpp kwin/effects/presentwindows/main.qml kwin/effects/presentwindows/presentwindows.cpp kwin/effects/presentwindows/presentwindows.h kwin/effects/zoom/zoom_config.cpp kwin/libkwineffects/kwinglutils_funcs.cpp kwin/libkwineffects/kwinxrenderutils.cpp kwin/nvidiahack.cpp kwin/xcbutils.h plasma/desktop/containments/desktop/plasma-containment-desktop.desktop plasma/generic/wallpapers/image/image.cpp plasma/generic/wallpapers/image/plasma-wallpaper-image.desktop		2013-08-07 10:10:06 +02:00
..
aurorae	Merge branch 'master' into frameworks-scratch	2013-08-07 10:10:06 +02:00
b2
laptop
oxygen	Unbreak the build	2013-08-07 05:19:28 +02:00
CMakeLists.txt	Re-enable compilation of KWin decorations	2013-07-25 18:05:58 +02:00
Messages.sh