← Back to branch summary

~compiz-linaro-team/compiz/gles2

~compiz-linaro-team/compiz/gles2

Viewing all changes in revision 3375.

Committer: Daniel van Vugt
Date: 2012-08-22 05:01:55 UTC
mfrom: (3201.2.116 compiz)
Revision ID: daniel.van.vugt@canonical.com-20120822050155-3pc08xyw9j874aaq

Merge latest lp:compiz

files added:
compizconfig/libcompizconfig/include/ccs-defs.h

compizconfig/libcompizconfig/include/ccs-list.h

compizconfig/libcompizconfig/include/ccs-object.h

compizconfig/libcompizconfig/include/ccs-string.h

compizconfig/tests

compizconfig/tests/compizconfig_ccs_mocked_allocator.h

files modified:
compizconfig/compizconfig-python/src/compizconfig.pyx

compizconfig/gconf/src/gconf.c

compizconfig/gsettings/src/gsettings.c

compizconfig/libcompizconfig/backend/src/ini.c

compizconfig/libcompizconfig/include/ccs-backend.h

compizconfig/libcompizconfig/include/ccs.h

compizconfig/libcompizconfig/src/ccs-private.h

compizconfig/libcompizconfig/src/compiz.cpp

compizconfig/libcompizconfig/src/ini.c

compizconfig/libcompizconfig/src/lists.c

compizconfig/libcompizconfig/src/main.c

compizconfig/libcompizconfig/tests/CMakeLists.txt

compizconfig/libcompizconfig/tests/context-mock.cpp

compizconfig/libcompizconfig/tests/mock-context.h

compizconfig/libcompizconfig/tests/mock-plugin.h

compizconfig/libcompizconfig/tests/mock-setting.h

compizconfig/libcompizconfig/tests/plugin-mock.cpp

compizconfig/libcompizconfig/tests/setting-mock.cpp

compizconfig/libcompizconfig/tests/test-ccs-object.cpp

compizconfig/libcompizconfig/tests/test-context.cpp

compizconfig/libcompizconfig/tests/test-plugin.cpp

compizconfig/libcompizconfig/tests/test-setting.cpp

gtk/window-decorator/settings.c

Show diffs side-by-side

added added

removed removed

compizconfig/compizconfig-python/src/compizconfig.pyx

compizconfig/gconf/src/gconf.c

compizconfig/gsettings/src/gsettings.c

compizconfig/libcompizconfig/backend/src/ini.c

compizconfig/libcompizconfig/include/ccs-backend.h

compizconfig/libcompizconfig/include/ccs-defs.h

compizconfig/libcompizconfig/include/ccs-list.h

compizconfig/libcompizconfig/include/ccs-object.h

compizconfig/libcompizconfig/include/ccs-string.h

compizconfig/libcompizconfig/include/ccs.h

compizconfig/libcompizconfig/src/ccs-private.h

compizconfig/libcompizconfig/src/compiz.cpp

compizconfig/libcompizconfig/src/ini.c

compizconfig/libcompizconfig/src/lists.c

compizconfig/libcompizconfig/src/main.c

compizconfig/libcompizconfig/tests/CMakeLists.txt

compizconfig/libcompizconfig/tests/context-mock.cpp

compizconfig/libcompizconfig/tests/mock-context.h

compizconfig/libcompizconfig/tests/mock-plugin.h

compizconfig/libcompizconfig/tests/mock-setting.h

compizconfig/libcompizconfig/tests/plugin-mock.cpp

compizconfig/libcompizconfig/tests/setting-mock.cpp

compizconfig/libcompizconfig/tests/test-ccs-object.cpp

compizconfig/libcompizconfig/tests/test-context.cpp

compizconfig/libcompizconfig/tests/test-plugin.cpp

compizconfig/libcompizconfig/tests/test-setting.cpp

compizconfig/tests/

compizconfig/tests/compizconfig_ccs_mocked_allocator.h

gtk/window-decorator/settings.c

Older »