← Back to branch summary

~smspillaz/compiz/gles2.fix_1001171

~smspillaz/compiz/gles2.fix_1001171

Viewing all changes in revision 3225.

Committer: smspillaz
Date: 2012-05-26 10:52:26 UTC
mfrom: (3201.2.24 compiz)
Revision ID: sam.spilsbury@canonical.com-20120526105226-now01e57butce41o

Merge lp:compiz

files added:
compizconfig/libcompizconfig/libcompizconfig_internal.pc.in

files removed:
compizconfig/libcompizconfig/plugin

compizconfig/libcompizconfig/plugin/CMakeLists.txt

compizconfig/libcompizconfig/plugin/ccp.xml

files renamed:
compizconfig/libcompizconfig/plugin/ccp/ => plugins/ccp/

files modified:
CMakeLists.txt

cmake/CMakeLists.txt

cmake/CompizCommon.cmake

cmake/CompizGSettings.cmake

cmake/CompizGconf.cmake

cmake/CompizPlugin.cmake

cmake/base.cmake

cmake/plugin_extensions/CompizGenGSettings.cmake

cmake/plugin_extensions/CompizGenGconf.cmake

cmake/plugin_extensions/CompizGenInstallData.cmake

cmake/plugin_extensions/CompizGenInstallImages.cmake

compizconfig/CMakeLists.txt

compizconfig/ccsm/CMakeLists.txt

compizconfig/compizconfig-python/CMakeLists.txt

compizconfig/compizconfig-python/setup.py

compizconfig/compizconfig-python/src/compizconfig.pyx

compizconfig/compizconfig-python/tests/compiz_config_test.py

compizconfig/compizconfig-python/tests/test_backend.py

compizconfig/compizconfig-python/tests/test_plugin.py

compizconfig/compizconfig-python/tests/test_profile.py

compizconfig/compizconfig-python/tests/test_setting.py

compizconfig/gconf/CMakeLists.txt

compizconfig/gconf/src/gconf.c

compizconfig/gsettings/CMakeLists.txt

compizconfig/gsettings/src/gsettings.c

compizconfig/libcompizconfig/CMakeLists.txt

compizconfig/libcompizconfig/backend/src/ini.c

compizconfig/libcompizconfig/cmake/CMakeLists.txt

compizconfig/libcompizconfig/cmake/LibCompizConfigCommon.cmake

compizconfig/libcompizconfig/config/CMakeLists.txt

compizconfig/libcompizconfig/include/CMakeLists.txt

compizconfig/libcompizconfig/libcompizconfig.pc.in

compizconfig/libcompizconfig/src/CMakeLists.txt

compizconfig/libcompizconfig/src/compiz.cpp

compizconfig/libcompizconfig/src/config.c

compizconfig/libcompizconfig/src/ini.c

compizconfig/libcompizconfig/src/main.c

gtk/gnome/CMakeLists.txt

gtk/window-decorator/CMakeLists.txt

images/CMakeLists.txt

include/CMakeLists.txt

kde/window-decorator-kde4/CMakeLists.txt

libdecoration/CMakeLists.txt

metadata/CMakeLists.txt

plugins/animation/src/animation.cpp

plugins/animation/src/transform.cpp

plugins/animationaddon/src/airplane.cpp

plugins/animationaddon/src/particle.cpp

plugins/ccp/CMakeLists.txt

plugins/ccp/src/ccp.h

plugins/composite/include/composite/composite.h

plugins/composite/src/privates.h

plugins/composite/src/window.cpp

plugins/group/src/layers.h

plugins/opengl/src/privates.h

plugins/opengl/src/window.cpp

plugins/wall/src/wall.cpp

po/CMakeLists.txt

src/CMakeLists.txt

src/privatescreen.h

src/privatescreen/tests/test-privatescreen.cpp

src/screen.cpp

xslt/CMakeLists.txt

Show diffs side-by-side

added added

removed removed

cmake/CMakeLists.txt

cmake/CompizCommon.cmake

cmake/CompizGSettings.cmake

cmake/CompizGconf.cmake

cmake/CompizPlugin.cmake

cmake/base.cmake

cmake/plugin_extensions/CompizGenGSettings.cmake

cmake/plugin_extensions/CompizGenGconf.cmake

cmake/plugin_extensions/CompizGenInstallData.cmake

cmake/plugin_extensions/CompizGenInstallImages.cmake

compizconfig/CMakeLists.txt

compizconfig/ccsm/CMakeLists.txt

compizconfig/compizconfig-python/CMakeLists.txt

compizconfig/compizconfig-python/setup.py

compizconfig/compizconfig-python/src/compizconfig.pyx

compizconfig/compizconfig-python/tests/compiz_config_test.py

compizconfig/compizconfig-python/tests/test_backend.py

compizconfig/compizconfig-python/tests/test_plugin.py

compizconfig/compizconfig-python/tests/test_profile.py

compizconfig/compizconfig-python/tests/test_setting.py

compizconfig/gconf/CMakeLists.txt

compizconfig/gconf/src/gconf.c

compizconfig/gsettings/CMakeLists.txt

compizconfig/gsettings/src/gsettings.c

compizconfig/libcompizconfig/CMakeLists.txt

compizconfig/libcompizconfig/backend/src/ini.c

compizconfig/libcompizconfig/cmake/CMakeLists.txt

compizconfig/libcompizconfig/cmake/LibCompizConfigCommon.cmake

compizconfig/libcompizconfig/config/CMakeLists.txt

compizconfig/libcompizconfig/include/CMakeLists.txt

compizconfig/libcompizconfig/libcompizconfig.pc.in

compizconfig/libcompizconfig/libcompizconfig_internal.pc.in

compizconfig/libcompizconfig/plugin/

compizconfig/libcompizconfig/plugin/CMakeLists.txt

compizconfig/libcompizconfig/plugin/ccp.xml

compizconfig/libcompizconfig/src/CMakeLists.txt

compizconfig/libcompizconfig/src/compiz.cpp

compizconfig/libcompizconfig/src/config.c

compizconfig/libcompizconfig/src/ini.c

compizconfig/libcompizconfig/src/main.c

gtk/gnome/CMakeLists.txt

gtk/window-decorator/CMakeLists.txt

images/CMakeLists.txt

include/CMakeLists.txt

kde/window-decorator-kde4/CMakeLists.txt

libdecoration/CMakeLists.txt

metadata/CMakeLists.txt

plugins/animation/src/animation.cpp

plugins/animation/src/transform.cpp

plugins/animationaddon/src/airplane.cpp

plugins/animationaddon/src/particle.cpp

plugins/ccp/CMakeLists.txt

plugins/ccp/src/ccp.h

plugins/composite/include/composite/composite.h

plugins/composite/src/privates.h

plugins/composite/src/window.cpp

plugins/group/src/layers.h

plugins/opengl/src/privates.h

plugins/opengl/src/window.cpp

plugins/wall/src/wall.cpp

po/CMakeLists.txt

src/CMakeLists.txt

src/privatescreen.h

src/privatescreen/tests/test-privatescreen.cpp

xslt/CMakeLists.txt

Older »