← Back to branch summary

~mc-return/compiz/compiz.merge-cubeaddon-improvements

~mc-return/compiz/compiz.merge-cubeaddon-improvements

Viewing all changes in revision 3757.

Committer: MC Return
Date: 2013-07-21 12:38:47 UTC
mfrom: (3753.2.15 0.9.10)
Revision ID: mc.return@gmx.net-20130721123847-w68h1rio9gwu0d36

Merged latest lp:compiz

files added:
compizconfig/mocks/libcompizconfig/compizconfig_ccs_setting_stub.cpp

compizconfig/mocks/libcompizconfig/compizconfig_ccs_setting_stub.h

scripts/release.py

files removed:
cmake/GoogleTest.cmake

src/logmessage/include

src/logmessage/include/core

src/logmessage/include/core/logmessage.h

files renamed:
cmake/FindGoogleTest.cmake => cmake/GoogleTest.cmake

files modified:
CMakeLists.txt

cmake/src/compiz/compiz_discover_gtest_tests.cpp

compizconfig/libcompizconfig/tests/compizconfig_test_ccs_mock_backend_conformance.cpp

compizconfig/libcompizconfig/tests/compizconfig_test_ccs_object.cpp

compizconfig/libcompizconfig/tests/compizconfig_test_ccs_setting.cpp

compizconfig/mocks/libcompizconfig/CMakeLists.txt

compizconfig/tests/CMakeLists.txt

compizconfig/tests/compizconfig_backend_concept_test.cpp

compizconfig/tests/compizconfig_ccs_list_wrapper.cpp

compizconfig/tests/compizconfig_ccs_list_wrapper.h

debian/compiz-plugins.install.armel

debian/compiz-plugins.install.armhf

include/core/CMakeLists.txt

plugins/CMakeLists.txt

plugins/annotate/annotate.xml.in

plugins/annotate/src/annotate.cpp

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

plugins/dbus/src/dbus.cpp

plugins/dbus/src/dbus.h

plugins/decor/src/decor.cpp

plugins/decor/tests/acceptance/xorg-gtest/CMakeLists.txt

plugins/decor/tests/acceptance/xorg-gtest/compiz_decor_acceptance_tests.cpp

plugins/expo/src/expo.cpp

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

plugins/grid/src/grid.cpp

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

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

plugins/resize/src/logic/tests/CMakeLists.txt

plugins/thumbnail/src/thumbnail.cpp

plugins/thumbnail/src/thumbnail.h

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

plugins/wizard/include/wizard.h

plugins/wizard/src/wizard.cpp

src/logmessage/CMakeLists.txt

src/privatewindow.h

src/region/tests/test-region.cpp

src/session.cpp

src/window.cpp

tests/system/xorg-gtest/tests/compiz_xorg_gtest_configure_window.cpp

tests/system/xorg-gtest/tests/compiz_xorg_gtest_test_window_stacking.cpp

tests/xorg-gtest/communicator/compiz_xorg_gtest_communicator.cpp

tests/xorg-gtest/communicator/compiz_xorg_gtest_communicator.h

tests/xorg-gtest/include/compiz-xorg-gtest.h

tests/xorg-gtest/plugins/testhelper/src/testhelper.cpp

tests/xorg-gtest/plugins/testhelper/src/testhelper.h

tests/xorg-gtest/src/compiz-xorg-gtest.cpp

Show diffs side-by-side

added added

removed removed

cmake/GoogleTest.cmake

cmake/GoogleTest.cmake

cmake/src/compiz/compiz_discover_gtest_tests.cpp

compizconfig/libcompizconfig/tests/compizconfig_test_ccs_mock_backend_conformance.cpp

compizconfig/libcompizconfig/tests/compizconfig_test_ccs_object.cpp

compizconfig/libcompizconfig/tests/compizconfig_test_ccs_setting.cpp

compizconfig/mocks/libcompizconfig/CMakeLists.txt

compizconfig/mocks/libcompizconfig/compizconfig_ccs_setting_stub.cpp

compizconfig/mocks/libcompizconfig/compizconfig_ccs_setting_stub.h

compizconfig/tests/CMakeLists.txt

compizconfig/tests/compizconfig_backend_concept_test.cpp

compizconfig/tests/compizconfig_ccs_list_wrapper.cpp

compizconfig/tests/compizconfig_ccs_list_wrapper.h

debian/compiz-plugins.install.armel

debian/compiz-plugins.install.armhf

include/core/CMakeLists.txt

plugins/CMakeLists.txt

plugins/annotate/annotate.xml.in

plugins/annotate/src/annotate.cpp

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

plugins/dbus/src/dbus.cpp

plugins/dbus/src/dbus.h

plugins/decor/src/decor.cpp

plugins/decor/tests/acceptance/xorg-gtest/CMakeLists.txt

plugins/decor/tests/acceptance/xorg-gtest/compiz_decor_acceptance_tests.cpp

plugins/expo/src/expo.cpp

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

plugins/grid/src/grid.cpp

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

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

plugins/resize/src/logic/tests/CMakeLists.txt

plugins/thumbnail/src/thumbnail.cpp

plugins/thumbnail/src/thumbnail.h

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

plugins/wizard/include/wizard.h

plugins/wizard/src/wizard.cpp

scripts/release.py

src/logmessage/CMakeLists.txt

src/logmessage/include/

src/logmessage/include/core/

src/logmessage/include/core/logmessage.h

src/privatewindow.h

src/region/tests/test-region.cpp

src/session.cpp

tests/system/xorg-gtest/tests/compiz_xorg_gtest_configure_window.cpp

tests/system/xorg-gtest/tests/compiz_xorg_gtest_test_window_stacking.cpp

tests/xorg-gtest/communicator/compiz_xorg_gtest_communicator.cpp

tests/xorg-gtest/communicator/compiz_xorg_gtest_communicator.h

tests/xorg-gtest/include/compiz-xorg-gtest.h

tests/xorg-gtest/plugins/testhelper/src/testhelper.cpp

tests/xorg-gtest/plugins/testhelper/src/testhelper.h

tests/xorg-gtest/src/compiz-xorg-gtest.cpp

Older »