← Back to branch summary

~compiz-team/compiz/0.9.12

~compiz-team/compiz/0.9.12

Viewing all changes in revision 3248.5.23.

Committer: Sam Spilsbury
Date: 2012-08-22 10:07:45 UTC
mfrom: (3201.2.177 gles2)
mto: (3248.1.29 compiz)
mto: This revision was merged to the branch mainline in revision 3451.
Revision ID: sam.spilsbury@canonical.com-20120822100745-j5bofdehkq79wcvq

Merge

files added:
cmake/FindOpenGLES2.cmake

cmake/plugin_extensions/CompizOpenGLFixups.cmake

plugins/opengl/include/opengl/doublebuffer.h

plugins/opengl/include/opengl/framebufferobject.h

plugins/opengl/include/opengl/program.h

plugins/opengl/include/opengl/programcache.h

plugins/opengl/include/opengl/shadercache.h

plugins/opengl/include/opengl/vertexbuffer.h

plugins/opengl/src/doublebuffer

plugins/opengl/src/doublebuffer/CMakeLists.txt

plugins/opengl/src/doublebuffer/src

plugins/opengl/src/doublebuffer/src/double-buffer.cpp

plugins/opengl/src/doublebuffer/tests

plugins/opengl/src/doublebuffer/tests/CMakeLists.txt

plugins/opengl/src/doublebuffer/tests/test-opengl-double-buffer.cpp

plugins/opengl/src/framebufferobject.cpp

plugins/opengl/src/privatevertexbuffer.h

plugins/opengl/src/program.cpp

plugins/opengl/src/programcache.cpp

plugins/opengl/src/shadercache.cpp

plugins/opengl/src/vertexbuffer.cpp

plugins/water/src/shaders.h

files removed:
plugins/opengl/include/opengl/fragment.h

plugins/opengl/src/fragment.cpp

plugins/opengl/src/privatefragment.h

files modified:
cmake/CMakeLists.txt

cmake/CompizCommon.cmake

cmake/CompizPlugin.cmake

cmake/FindCompiz.cmake

cmake/base.cmake

include/core/wrapsystem.h

plugins/CMakeLists.txt

plugins/animation/CMakeLists.txt

plugins/animation/include/animation/animation.h

plugins/animation/include/animation/animeffect.h

plugins/animation/include/animation/grid.h

plugins/animation/src/animation.cpp

plugins/animation/src/grid.cpp

plugins/animation/src/private.h

plugins/annotate/src/annotate.cpp

plugins/blur/CMakeLists.txt

plugins/clone/src/clone.cpp

plugins/compiztoolbox/src/compiztoolbox.cpp

plugins/copytex/src/copytex.cpp

plugins/cube/include/cube/cube.h

plugins/cube/src/cube.cpp

plugins/decor/src/decor.cpp

plugins/decor/src/decor.h

plugins/expo/CMakeLists.txt

plugins/expo/src/expo.cpp

plugins/expo/src/expo.h

plugins/ezoom/src/ezoom.cpp

plugins/grid/src/grid.cpp

plugins/imgsvg/src/imgsvg.cpp

plugins/imgsvg/src/imgsvg.h

plugins/kdecompat/src/kdecompat.cpp

plugins/mag/src/mag.cpp

plugins/mag/src/mag.h

plugins/neg/src/neg.cpp

plugins/neg/src/neg.h

plugins/obs/src/obs.cpp

plugins/obs/src/obs.h

plugins/opengl/CMakeLists.txt

plugins/opengl/compiz-opengl.pc.in

plugins/opengl/include/opengl/matrix.h

plugins/opengl/include/opengl/opengl.h

plugins/opengl/include/opengl/texture.h

plugins/opengl/include/opengl/vector.h

plugins/opengl/opengl.xml.in

plugins/opengl/src/matrix.cpp

plugins/opengl/src/paint.cpp

plugins/opengl/src/privates.h

plugins/opengl/src/privatetexture.h

plugins/opengl/src/screen.cpp

plugins/opengl/src/texture.cpp

plugins/opengl/src/vector.cpp

plugins/opengl/src/window.cpp

plugins/resize/src/resize.cpp

plugins/resizeinfo/src/resizeinfo.cpp

plugins/resizeinfo/src/resizeinfo.h

plugins/ring/src/ring.cpp

plugins/ring/src/ring.h

plugins/scale/src/scale.cpp

plugins/scaleaddon/src/scaleaddon.cpp

plugins/scaleaddon/src/scaleaddon.h

plugins/scalefilter/src/scalefilter.cpp

plugins/screenshot/src/screenshot.cpp

plugins/shift/src/shift.cpp

plugins/shift/src/shift.h

plugins/staticswitcher/src/staticswitcher.cpp

plugins/staticswitcher/src/staticswitcher.h

plugins/switcher/src/switcher.cpp

plugins/text/include/text/text.h

plugins/text/src/text.cpp

plugins/thumbnail/src/thumbnail.cpp

plugins/thumbnail/src/thumbnail.h

plugins/wall/src/wall.cpp

plugins/wall/src/wall.h

plugins/water/src/water.cpp

plugins/water/src/water.h

plugins/water/water.xml.in

plugins/wobbly/src/wobbly.cpp

plugins/wobbly/src/wobbly.h

plugins/workarounds/src/workarounds.cpp

plugins/workarounds/src/workarounds.h

plugins/workspacenames/src/workspacenames.cpp

plugins/workspacenames/src/workspacenames.h

Show diffs side-by-side

added added

removed removed

cmake/CMakeLists.txt

cmake/CompizCommon.cmake

cmake/CompizPlugin.cmake

cmake/FindCompiz.cmake

cmake/FindOpenGLES2.cmake

cmake/base.cmake

cmake/plugin_extensions/CompizOpenGLFixups.cmake

include/core/wrapsystem.h

plugins/CMakeLists.txt

plugins/animation/CMakeLists.txt

plugins/animation/include/animation/animation.h

plugins/animation/include/animation/animeffect.h

plugins/animation/include/animation/grid.h

plugins/animation/src/animation.cpp

plugins/animation/src/grid.cpp

plugins/animation/src/private.h

plugins/annotate/src/annotate.cpp

plugins/blur/CMakeLists.txt

plugins/clone/src/clone.cpp

plugins/compiztoolbox/src/compiztoolbox.cpp

plugins/copytex/src/copytex.cpp

plugins/cube/include/cube/cube.h

plugins/cube/src/cube.cpp

plugins/decor/src/decor.cpp

plugins/decor/src/decor.h

plugins/expo/CMakeLists.txt

plugins/expo/src/expo.cpp

plugins/expo/src/expo.h

plugins/ezoom/src/ezoom.cpp

plugins/grid/src/grid.cpp

plugins/imgsvg/src/imgsvg.cpp

plugins/imgsvg/src/imgsvg.h

plugins/kdecompat/src/kdecompat.cpp

plugins/mag/src/mag.cpp

plugins/mag/src/mag.h

plugins/neg/src/neg.cpp

plugins/neg/src/neg.h

plugins/obs/src/obs.cpp

plugins/obs/src/obs.h

plugins/opengl/CMakeLists.txt

plugins/opengl/compiz-opengl.pc.in

plugins/opengl/include/opengl/doublebuffer.h

plugins/opengl/include/opengl/fragment.h

plugins/opengl/include/opengl/framebufferobject.h

plugins/opengl/include/opengl/matrix.h

plugins/opengl/include/opengl/opengl.h

plugins/opengl/include/opengl/program.h

plugins/opengl/include/opengl/programcache.h

plugins/opengl/include/opengl/shadercache.h

plugins/opengl/include/opengl/texture.h

plugins/opengl/include/opengl/vector.h

plugins/opengl/include/opengl/vertexbuffer.h

plugins/opengl/opengl.xml.in

plugins/opengl/src/doublebuffer/

plugins/opengl/src/doublebuffer/CMakeLists.txt

plugins/opengl/src/doublebuffer/src/

plugins/opengl/src/doublebuffer/src/double-buffer.cpp

plugins/opengl/src/doublebuffer/tests/

plugins/opengl/src/doublebuffer/tests/CMakeLists.txt

plugins/opengl/src/doublebuffer/tests/test-opengl-double-buffer.cpp

plugins/opengl/src/fragment.cpp

plugins/opengl/src/framebufferobject.cpp

plugins/opengl/src/matrix.cpp

plugins/opengl/src/paint.cpp

plugins/opengl/src/privatefragment.h

plugins/opengl/src/privates.h

plugins/opengl/src/privatetexture.h

plugins/opengl/src/privatevertexbuffer.h

plugins/opengl/src/program.cpp

plugins/opengl/src/programcache.cpp

plugins/opengl/src/screen.cpp

plugins/opengl/src/shadercache.cpp

plugins/opengl/src/texture.cpp

plugins/opengl/src/vector.cpp

plugins/opengl/src/vertexbuffer.cpp

plugins/opengl/src/window.cpp

plugins/resize/src/resize.cpp

plugins/resizeinfo/src/resizeinfo.cpp

plugins/resizeinfo/src/resizeinfo.h

plugins/ring/src/ring.cpp

plugins/ring/src/ring.h

plugins/scale/src/scale.cpp

plugins/scaleaddon/src/scaleaddon.cpp

plugins/scaleaddon/src/scaleaddon.h

plugins/scalefilter/src/scalefilter.cpp

plugins/screenshot/src/screenshot.cpp

plugins/shift/src/shift.cpp

plugins/shift/src/shift.h

plugins/staticswitcher/src/staticswitcher.cpp

plugins/staticswitcher/src/staticswitcher.h

plugins/switcher/src/switcher.cpp

plugins/text/include/text/text.h

plugins/text/src/text.cpp

plugins/thumbnail/src/thumbnail.cpp

plugins/thumbnail/src/thumbnail.h

plugins/wall/src/wall.cpp

plugins/wall/src/wall.h

plugins/water/src/shaders.h

plugins/water/src/water.cpp

plugins/water/src/water.h

plugins/water/water.xml.in

plugins/wobbly/src/wobbly.cpp

plugins/wobbly/src/wobbly.h

plugins/workarounds/src/workarounds.cpp

plugins/workarounds/src/workarounds.h

plugins/workspacenames/src/workspacenames.cpp

plugins/workspacenames/src/workspacenames.h

Older »