Viewing all changes in revision 3248.1.29.
- Committer: Sebastien Bacher
- Date: 2012-08-22 12:15:38 UTC
- mfrom: (3248.5.26 ubuntu_quantal_trunk)
- mto: (3248.1.31 revert) (3450.1.1 compiz.inline)
- mto: This revision was merged to the branch mainline in revision 3451.
- Revision ID: seb128@ubuntu.com-20120822121538-o4ov0dntodd68c1l
Merge GLES support
- files added:
- cmake/FindOpenGLES2.cmake
- compizconfig/integration
- compizconfig/integration/gnome
- compizconfig/integration/gnome/gconf
- compizconfig/integration/gnome/gconf/include
- compizconfig/integration/gnome/gconf/src
- compizconfig/integration/gnome/gsettings
- compizconfig/integration/gnome/gsettings/include
- compizconfig/integration/gnome/gsettings/src
- compizconfig/integration/gnome/include
- compizconfig/integration/gnome/src
- compizconfig/mocks
- compizconfig/mocks/libcompizconfig
- compizconfig/tests
- plugins/opengl/src/doublebuffer
- plugins/opengl/src/doublebuffer/src
- plugins/opengl/src/doublebuffer/tests
- plugins/resize/src/logic
- plugins/resize/src/logic/include
- plugins/resize/src/logic/src
- plugins/resize/src/logic/tests
- tests/shared
- tests/util
- files removed:
- compizconfig/gsettings/tests/gsettings_mocks.cpp
- files renamed:
- compizconfig/gsettings/src/gconf-integration.c => compizconfig/integration/gnome/src/ccs_gnome_integration.c
- compizconfig/libcompizconfig/tests/test-context.cpp => compizconfig/libcompizconfig/tests/compizconfig_test_ccs_context.cpp
- compizconfig/libcompizconfig/tests/test-ccs-object.cpp => compizconfig/libcompizconfig/tests/compizconfig_test_ccs_object.cpp
- compizconfig/libcompizconfig/tests/test-plugin.cpp => compizconfig/libcompizconfig/tests/compizconfig_test_ccs_plugin.cpp
- compizconfig/libcompizconfig/tests/test-setting.cpp => compizconfig/libcompizconfig/tests/compizconfig_test_ccs_setting.cpp
- compizconfig/libcompizconfig/tests/context-mock.cpp => compizconfig/mocks/libcompizconfig/compizconfig_ccs_context_mock.cpp
- compizconfig/libcompizconfig/tests/mock-context.h => compizconfig/mocks/libcompizconfig/compizconfig_ccs_context_mock.h
- compizconfig/libcompizconfig/tests/plugin-mock.cpp => compizconfig/mocks/libcompizconfig/compizconfig_ccs_plugin_mock.cpp
- compizconfig/libcompizconfig/tests/mock-plugin.h => compizconfig/mocks/libcompizconfig/compizconfig_ccs_plugin_mock.h
- compizconfig/libcompizconfig/tests/setting-mock.cpp => compizconfig/mocks/libcompizconfig/compizconfig_ccs_setting_mock.cpp
- compizconfig/libcompizconfig/tests/mock-setting.h => compizconfig/mocks/libcompizconfig/compizconfig_ccs_setting_mock.h
- files modified:
- CMakeLists.txt
expand all
collapse all
added
removed
