← Back to branch summary

~compiz-team/compiz/compiz.packaging.gles

~compiz-team/compiz/compiz.packaging.gles

Viewing all changes in revision 3277.

Committer: Sam Spilsbury
Date: 2012-07-11 17:16:02 UTC
mfrom: (3248.1.36 compiz)
Revision ID: sam.spilsbury@canonical.com-20120711171602-lnpshyor415o4fmt

Merge lp:compiz

files added:
cmake/copy_file_install_user_env.cmake

cmake/recompile_gsettings_schemas_in_dir_user_env.cmake

cmake/src

cmake/src/CMakeLists.txt

cmake/src/compiz

cmake/src/compiz/CMakeLists.txt

cmake/src/compiz/compiz_discover_gtest_tests.cpp

compizconfig/gsettings/gsettings_backend_shared

compizconfig/gsettings/gsettings_backend_shared/CMakeLists.txt

compizconfig/gsettings/gsettings_backend_shared/gsettings_constants.c

compizconfig/gsettings/gsettings_backend_shared/gsettings_shared.h

compizconfig/gsettings/gsettings_backend_shared/gsettings_util.c

compizconfig/gsettings/gsettings_backend_shared/gsettings_util.h

compizconfig/gsettings/tests

compizconfig/gsettings/tests/CMakeLists.txt

compizconfig/gsettings/tests/gsettings_mocks.cpp

compizconfig/gsettings/tests/gsettings_mocks.h

compizconfig/gsettings/tests/test_gsettings.cpp

compizconfig/gsettings/tests/test_gsettings_tests.cpp

compizconfig/gsettings/tests/test_gsettings_tests.h

plugins/trip

plugins/trip/CMakeLists.txt

plugins/trip/VERSION

plugins/trip/src

plugins/trip/src/trip.cpp

plugins/trip/src/trip.h

plugins/trip/trip.xml.in

postinst

postinst/CMakeLists.txt

tests/manual

tests/manual/GSettings.txt

files renamed:
compizconfig/gsettings/org.freedesktop.compizconfig.gschema.xml => compizconfig/gsettings/org.compiz.gschema.xml

files modified:
CMakeLists.txt

cmake/CMakeLists.txt

cmake/CompizCommon.cmake

cmake/CompizGSettings.cmake

cmake/plugin_extensions/CompizGenGSettings.cmake

compizconfig/compizconfig-python/tests/compiz_config_test.py

compizconfig/gsettings/CMakeLists.txt

compizconfig/gsettings/src/gsettings.c

compizconfig/gsettings/src/gsettings.h

compizconfig/libcompizconfig/include/ccs.h

compizconfig/libcompizconfig/src/main.c

compizconfig/libcompizconfig/tests/CMakeLists.txt

compizconfig/libcompizconfig/tests/mock-setting.h

compizconfig/libcompizconfig/tests/plugin-mock.cpp

compizconfig/libcompizconfig/tests/setting-mock.cpp

gtk/window-decorator/wnck.c

metadata/CMakeLists.txt

plugins/composite/src/pixmapbinding/tests/CMakeLists.txt

plugins/decor/src/clip-groups/tests/CMakeLists.txt

plugins/decor/src/decor.cpp

plugins/decor/src/pixmap-requests/tests/CMakeLists.txt

plugins/grid/src/grabhandler/tests/CMakeLists.txt

plugins/place/src/constrain-to-workarea/tests/CMakeLists.txt

plugins/place/src/screen-size-change/tests/CMakeLists.txt

plugins/place/src/smart/tests/CMakeLists.txt

plugins/wall/src/offset_movement/tests/CMakeLists.txt

src/option/tests/CMakeLists.txt

src/plugin/tests/CMakeLists.txt

src/pluginclasshandler/tests/CMakeLists.txt

src/point/tests/CMakeLists.txt

src/privatescreen/tests/CMakeLists.txt

src/rect/tests/CMakeLists.txt

src/region/tests/CMakeLists.txt

src/servergrab/tests/CMakeLists.txt

src/string/tests/CMakeLists.txt

src/timer/tests/CMakeLists.txt

src/window/constrainment/tests/CMakeLists.txt

src/window/extents/tests/CMakeLists.txt

src/window/geometry-saver/tests/CMakeLists.txt

src/window/geometry/tests/CMakeLists.txt

src/wrapsystem/tests/CMakeLists.txt

xslt/compiz_gsettings_schemas.xslt.in

Show diffs side-by-side

added added

removed removed

cmake/CMakeLists.txt

cmake/CompizCommon.cmake

cmake/CompizGSettings.cmake

cmake/copy_file_install_user_env.cmake

cmake/plugin_extensions/CompizGenGSettings.cmake

cmake/recompile_gsettings_schemas_in_dir_user_env.cmake

cmake/src/CMakeLists.txt

cmake/src/compiz/

cmake/src/compiz/CMakeLists.txt

cmake/src/compiz/compiz_discover_gtest_tests.cpp

compizconfig/compizconfig-python/tests/compiz_config_test.py

compizconfig/gsettings/CMakeLists.txt

compizconfig/gsettings/gsettings_backend_shared/

compizconfig/gsettings/gsettings_backend_shared/CMakeLists.txt

compizconfig/gsettings/gsettings_backend_shared/gsettings_constants.c

compizconfig/gsettings/gsettings_backend_shared/gsettings_shared.h

compizconfig/gsettings/gsettings_backend_shared/gsettings_util.c

compizconfig/gsettings/gsettings_backend_shared/gsettings_util.h

compizconfig/gsettings/org.compiz.gschema.xml

compizconfig/gsettings/src/gsettings.c

compizconfig/gsettings/src/gsettings.h

compizconfig/gsettings/tests/

compizconfig/gsettings/tests/CMakeLists.txt

compizconfig/gsettings/tests/gsettings_mocks.cpp

compizconfig/gsettings/tests/gsettings_mocks.h

compizconfig/gsettings/tests/test_gsettings.cpp

compizconfig/gsettings/tests/test_gsettings_tests.cpp

compizconfig/gsettings/tests/test_gsettings_tests.h

compizconfig/libcompizconfig/include/ccs.h

compizconfig/libcompizconfig/src/main.c

compizconfig/libcompizconfig/tests/CMakeLists.txt

compizconfig/libcompizconfig/tests/mock-setting.h

compizconfig/libcompizconfig/tests/plugin-mock.cpp

compizconfig/libcompizconfig/tests/setting-mock.cpp

gtk/window-decorator/wnck.c

metadata/CMakeLists.txt

plugins/composite/src/pixmapbinding/tests/CMakeLists.txt

plugins/decor/src/clip-groups/tests/CMakeLists.txt

plugins/decor/src/decor.cpp

plugins/decor/src/pixmap-requests/tests/CMakeLists.txt

plugins/grid/src/grabhandler/tests/CMakeLists.txt

plugins/place/src/constrain-to-workarea/tests/CMakeLists.txt

plugins/place/src/screen-size-change/tests/CMakeLists.txt

plugins/place/src/smart/tests/CMakeLists.txt

plugins/trip/CMakeLists.txt

plugins/trip/VERSION

plugins/trip/src/

plugins/trip/src/trip.cpp

plugins/trip/src/trip.h

plugins/trip/trip.xml.in

plugins/wall/src/offset_movement/tests/CMakeLists.txt

postinst/CMakeLists.txt

src/option/tests/CMakeLists.txt

src/plugin/tests/CMakeLists.txt

src/pluginclasshandler/tests/CMakeLists.txt

src/point/tests/CMakeLists.txt

src/privatescreen/tests/CMakeLists.txt

src/rect/tests/CMakeLists.txt

src/region/tests/CMakeLists.txt

src/servergrab/tests/CMakeLists.txt

src/string/tests/CMakeLists.txt

src/timer/tests/CMakeLists.txt

src/window/constrainment/tests/CMakeLists.txt

src/window/extents/tests/CMakeLists.txt

src/window/geometry-saver/tests/CMakeLists.txt

src/window/geometry/tests/CMakeLists.txt

src/wrapsystem/tests/CMakeLists.txt

tests/manual/GSettings.txt

xslt/compiz_gsettings_schemas.xslt.in

Older »