[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    =?utf-8?q?=5Bkde-workspace=5D_/=3A_Merge_branch_=27kwin-gles=27?=
From:       Martin_Gräßlin <kde () martin-graesslin ! com>
Date:       2011-01-31 21:06:53
Message-ID: 20110131210653.00EA8A60AE () git ! kde ! org
[Download RAW message or body]

Git commit 7f09bc4e4cafd7d6ef0016de6aa262ca20328392 by Martin Gräßlin.
Pushed by graesslin into branch 'master'.

Merge branch 'kwin-gles'

MM +3    -0    CMakeLists.txt     
I  +1    -0    cmake/modules/CMakeLists.txt     
I  +56   -0    cmake/modules/FindOpenGLES.cmake     
I  +18   -2    kwin/CMakeLists.txt     
I  +118  -0    kwin/compositingprefs.cpp     
I  +8    -0    kwin/compositingprefs.h     
I  +9    -4    kwin/effects/CMakeLists.txt     
I  +35   -35   kwin/effects/blur/blur.cpp     
I  +66   -82   kwin/effects/blur/blurshader.cpp     
I  +6    -6    kwin/effects/blur/blurshader.h     
I  +0    -4    kwin/effects/boxswitch/boxswitch.cpp     
I  +18   -9    kwin/effects/configs_builtins.cpp     
I  +5    -0    kwin/effects/coverswitch/CMakeLists.txt     
I  +9    -0    kwin/effects/coverswitch/coverswitch-reflection.glsl     
I  +135  -42   kwin/effects/coverswitch/coverswitch.cpp     
I  +2    -0    kwin/effects/coverswitch/coverswitch.h     
I  +2    -0    kwin/effects/cube/CMakeLists.txt     
I  +462  -465  kwin/effects/cube/cube.cpp     
I  +8    -6    kwin/effects/cube/cube.h     
I  +12   -3    kwin/effects/cube/cubeslide.cpp     
I  +28   -0    kwin/effects/cube/data/cube-cap.glsl     
I  +8    -0    kwin/effects/cube/data/cube-reflection.glsl     
I  +11   -27   kwin/effects/cube/data/cylinder.frag     
I  +23   -14   kwin/effects/cube/data/cylinder.vert     
I  +29   -19   kwin/effects/cube/data/sphere.vert     
I  +0    -1    kwin/effects/explosion/CMakeLists.txt     
I  +15   -5    kwin/effects/explosion/data/explosion.frag     
I  +0    -5    kwin/effects/explosion/data/explosion.vert     
I  +12   -13   kwin/effects/explosion/explosion.cpp     
I  +38   -12   kwin/effects/flipswitch/flipswitch.cpp     
I  +0    -1    kwin/effects/invert/CMakeLists.txt     
I  +11   -4    kwin/effects/invert/data/invert.frag     
I  +0    -6    kwin/effects/invert/data/invert.vert     
I  +46   -32   kwin/effects/invert/invert.cpp     
I  +4    -0    kwin/effects/invert/invert.h     
I  +0    -1    kwin/effects/lookingglass/CMakeLists.txt     
I  +16   -24   kwin/effects/lookingglass/data/lookingglass.frag     
I  +0    -6    kwin/effects/lookingglass/data/lookingglass.vert     
I  +115  -23   kwin/effects/lookingglass/lookingglass.cpp     
I  +17   -2    kwin/effects/lookingglass/lookingglass.h     
I  +41   -34   kwin/effects/magnifier/magnifier.cpp     
I  +35   -17   kwin/effects/mousemark/mousemark.cpp     
I  +31   -14   kwin/effects/resize/resize.cpp     
I  +5    -13   kwin/effects/screenshot/screenshot.cpp     
I  +92   -42   kwin/effects/showfps/showfps.cpp     
I  +35   -14   kwin/effects/showpaint/showpaint.cpp     
I  +1    -0    kwin/effects/showpaint/showpaint.h     
I  +49   -29   kwin/effects/snaphelper/snaphelper.cpp     
I  +5    -0    kwin/effects/startupfeedback/CMakeLists.txt     
I  +15   -0    kwin/effects/startupfeedback/data/blinking-startup-fragment.glsl     
I  +54   -18   kwin/effects/startupfeedback/startupfeedback.cpp     
I  +1    -0    kwin/effects/startupfeedback/startupfeedback.h     
I  +3    -3    kwin/effects/taskbarthumbnail/taskbarthumbnail.cpp     
I  +15   -3    kwin/effects/trackmouse/trackmouse.cpp     
I  +1    -1    kwin/effects/trackmouse/trackmouse.h     
I  +5    -4    kwin/effects/zoom/zoom.cpp     
I  +1    -1    kwin/kcmkwin/CMakeLists.txt     
I  +6    -3    kwin/kcmkwin/kwincompositing/CMakeLists.txt     
I  +5    -2    kwin/kcmkwin/kwinscreenedges/CMakeLists.txt     
I  +5    -3    kwin/lanczos-fragment.glsl     
I  +0    -6    kwin/lanczos-vertex.glsl     
I  +84   -26   kwin/lanczosfilter.cpp     
I  +7    -2    kwin/lib/CMakeLists.txt     
I  +12   -0    kwin/lib/kwinconfig.h.cmake     
I  +37   -11   kwin/lib/kwineffects.cpp     
I  +2    -0    kwin/lib/kwinglobals.cpp     
I  +9    -3    kwin/lib/kwinglplatform.cpp     
I  +693  -47   kwin/lib/kwinglutils.cpp     
I  +259  -1    kwin/lib/kwinglutils.h     
I  +51   -0    kwin/lib/kwinglutils_funcs.cpp     
I  +49   -0    kwin/lib/kwinglutils_funcs.h     
I  +12   -0    kwin/lib/kwinshadereffect.cpp     
I  +4    -0    kwin/lib/kwinshadereffect.h     
I  +2    -0    kwin/options.cpp     
I  +5    -1    kwin/resources.qrc     
I  +5    -0    kwin/scene-color-fragment.glsl     
I  +10   -0    kwin/scene-color-vertex.glsl     
I  +37   -0    kwin/scene-fragment.glsl     
I  +17   -0    kwin/scene-generic-vertex.glsl     
I  +16   -0    kwin/scene-vertex.glsl     
I  +292  -1076 kwin/scene_opengl.cpp     
I  +20   -8    kwin/scene_opengl.h     
I  +273  -0    kwin/scene_opengl_egl.cpp     
I  +978  -0    kwin/scene_opengl_glx.cpp     

http://commits.kde.org/a5d5b61a/7f09bc4e4cafd7d6ef0016de6aa262ca20328392



[prev in list] [next in list] [prev in thread] [next in thread]