← Back to branch summary

~compiz-team/compiz/compiz.fix_1024304

~compiz-team/compiz/compiz.fix_1024304

Viewing all changes in revision 3568.

Committer: Sam Spilsbury
Date: 2013-02-28 03:09:41 UTC
mfrom: (3517.78.26 0.9.9)
Revision ID: sam.spilsbury@canonical.com-20130228030941-xoh81cjptqtxhj48

Merge lp:compiz

files added:
tests/system/xorg-gtest/tests/compiz_xorg_gtest_configure_window.cpp

tests/xorg-gtest/communicator

tests/xorg-gtest/communicator/CMakeLists.txt

tests/xorg-gtest/communicator/compiz_xorg_gtest_communicator.cpp

tests/xorg-gtest/communicator/compiz_xorg_gtest_communicator.h

tests/xorg-gtest/plugins

tests/xorg-gtest/plugins/CMakeLists.txt

tests/xorg-gtest/plugins/testhelper

tests/xorg-gtest/plugins/testhelper/CMakeLists.txt

tests/xorg-gtest/plugins/testhelper/src

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

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

tests/xorg-gtest/plugins/testhelper/testhelper.xml.in

files removed:
tests/xorg-gtest/src/CMakeLists.txt

files modified:
CMakeLists.txt

cmake/CompizGSettings.cmake

cmake/CompizPlugin.cmake

cmake/plugin_extensions/CompizGenGSettings.cmake

cmake/plugin_extensions/CompizGenGconf.cmake

cmake/plugin_extensions/CompizGenInstallData.cmake

cmake/plugin_extensions/CompizGenInstallImages.cmake

compizconfig/ccsm/ccm/Utils.py

debian/changelog

plugins/CMakeLists.txt

plugins/addhelper/src/addhelper.cpp

plugins/decor/src/decor.cpp

plugins/firepaint/src/firepaint.cpp

plugins/firepaint/src/firepaint.h

plugins/inotify/src/inotify.cpp

plugins/move/move.xml.in

plugins/showmouse/src/showmouse.cpp

plugins/showmouse/src/showmouse.h

src/plugin.cpp

src/plugin/tests/CMakeLists.txt

src/plugin/tests/test-plugin.cpp

src/privatescreen.h

src/window.cpp

tests/acceptance-tests/xorg-gtest/tests/compiz_acceptance_replace_current_wm.cpp

tests/system/xorg-gtest/tests/CMakeLists.txt

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

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

tests/xorg-gtest/CMakeLists.txt

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

tests/xorg-gtest/src/compiz-xorg-gtest-config.h.in

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

tests/xorg-gtest/src/xorg_gtest_wrapper.cpp

Show diffs side-by-side

added added

removed removed

cmake/CompizGSettings.cmake

cmake/CompizPlugin.cmake

cmake/plugin_extensions/CompizGenGSettings.cmake

cmake/plugin_extensions/CompizGenGconf.cmake

cmake/plugin_extensions/CompizGenInstallData.cmake

cmake/plugin_extensions/CompizGenInstallImages.cmake

compizconfig/ccsm/ccm/Utils.py

debian/changelog

plugins/CMakeLists.txt

plugins/addhelper/src/addhelper.cpp

plugins/decor/src/decor.cpp

plugins/firepaint/src/firepaint.cpp

plugins/firepaint/src/firepaint.h

plugins/inotify/src/inotify.cpp

plugins/move/move.xml.in

plugins/showmouse/src/showmouse.cpp

plugins/showmouse/src/showmouse.h

src/plugin/tests/CMakeLists.txt

src/plugin/tests/test-plugin.cpp

src/privatescreen.h

tests/acceptance-tests/xorg-gtest/tests/compiz_acceptance_replace_current_wm.cpp

tests/system/xorg-gtest/tests/CMakeLists.txt

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

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

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

tests/xorg-gtest/CMakeLists.txt

tests/xorg-gtest/communicator/

tests/xorg-gtest/communicator/CMakeLists.txt

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/

tests/xorg-gtest/plugins/CMakeLists.txt

tests/xorg-gtest/plugins/testhelper/

tests/xorg-gtest/plugins/testhelper/CMakeLists.txt

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

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

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

tests/xorg-gtest/plugins/testhelper/testhelper.xml.in

tests/xorg-gtest/src/CMakeLists.txt

tests/xorg-gtest/src/compiz-xorg-gtest-config.h.in

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

tests/xorg-gtest/src/xorg_gtest_wrapper.cpp

Older »