← Back to branch summary

~compiz-team/compiz/0.9.10

~compiz-team/compiz/0.9.10

Viewing all changes in revision 3753.8.4.

Committer: Sam Spilsbury
Date: 2013-07-19 04:15:01 UTC
mfrom: (3764 0.9.10)
mto: This revision was merged to the branch mainline in revision 3765.
Revision ID: sam.spilsbury@canonical.com-20130719041501-suakec2ct8qiz387

Merge lp:compiz

files removed:
src/logmessage/include

src/logmessage/include/core

src/logmessage/include/core/logmessage.h

files modified:
include/core/CMakeLists.txt

plugins/grid/src/grid.cpp

src/logmessage/CMakeLists.txt

src/privatewindow.h

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

include/core/CMakeLists.txt

plugins/grid/src/grid.cpp

src/logmessage/CMakeLists.txt

src/logmessage/include/

src/logmessage/include/core/

src/logmessage/include/core/logmessage.h

src/privatewindow.h

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 »