← Back to branch summary

~ubuntu-branches/ubuntu/trusty/compiz/trusty

~ubuntu-branches/ubuntu/trusty/compiz/trusty

Viewing all changes in revision 3237.2.9.

Committer: Daniel van Vugt
Date: 2012-06-24 09:00:27 UTC
mfrom: (3248.1.12 trunk)
mto: (3248.1.17 trunk)
mto: This revision was merged to the branch mainline in revision 3275.
Revision ID: daniel.van.vugt@canonical.com-20120624090027-qaj8v4134owc3jq0

Rebase on latest upstream lp:compiz

files added:
plugins/composite/src/pixmapbinding

plugins/composite/src/pixmapbinding/CMakeLists.txt

plugins/composite/src/pixmapbinding/include

plugins/composite/src/pixmapbinding/include/pixmapbinding.h

plugins/composite/src/pixmapbinding/src

plugins/composite/src/pixmapbinding/src/pixmapbinding.cpp

plugins/composite/src/pixmapbinding/tests

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

plugins/composite/src/pixmapbinding/tests/test-composite-pixmapbinding.cpp

plugins/decor/src/compiz-decorator

plugins/workspacenames

plugins/workspacenames/CMakeLists.txt

plugins/workspacenames/src

plugins/workspacenames/src/workspacenames.cpp

plugins/workspacenames/src/workspacenames.h

plugins/workspacenames/workspacenames.xml.in

src/servergrab

src/servergrab/CMakeLists.txt

src/servergrab/include

src/servergrab/include/core

src/servergrab/include/core/servergrab.h

src/servergrab/src

src/servergrab/src/servergrab.cpp

src/servergrab/tests

src/servergrab/tests/CMakeLists.txt

src/servergrab/tests/test-servergrab.cpp

files removed:
src/plugin/tests/test-loader.cpp

files modified:
CMakeLists.txt

gtk/window-decorator/wnck.c

include/core/abiversion.h

include/core/plugin.h

include/core/screen.h

include/core/window.h

plugins/CMakeLists.txt

plugins/bench/src/bench.cpp

plugins/composite/CMakeLists.txt

plugins/composite/composite.xml.in

plugins/composite/include/composite/composite.h

plugins/composite/src/privates.h

plugins/composite/src/screen.cpp

plugins/composite/src/window.cpp

plugins/dbus/src/dbus.cpp

plugins/dbus/src/dbus.h

plugins/decor/CMakeLists.txt

plugins/decor/decor.xml.in

plugins/decor/src/decor.cpp

plugins/mousepoll/mousepoll.xml.in

plugins/opengl/src/texture.cpp

plugins/opengl/src/window.cpp

plugins/place/src/place.cpp

plugins/wall/src/offset_movement/src/offset-movement.cpp

src/CMakeLists.txt

src/event.cpp

src/main.cpp

src/option.cpp

src/plugin.cpp

src/plugin/CMakeLists.txt

src/plugin/tests/CMakeLists.txt

src/plugin/tests/test-plugin.cpp

src/privatescreen.h

src/privatescreen/tests/CMakeLists.txt

src/privatescreen/tests/test-privatescreen.cpp

src/privatestackdebugger.h

src/privatewindow.h

src/screen.cpp

src/stackdebugger.cpp

src/window.cpp

Show diffs side-by-side

added added

removed removed

gtk/window-decorator/wnck.c

include/core/abiversion.h

include/core/plugin.h

include/core/screen.h

include/core/window.h

plugins/CMakeLists.txt

plugins/bench/src/bench.cpp

plugins/composite/CMakeLists.txt

plugins/composite/composite.xml.in

plugins/composite/include/composite/composite.h

plugins/composite/src/pixmapbinding/

plugins/composite/src/pixmapbinding/CMakeLists.txt

plugins/composite/src/pixmapbinding/include/

plugins/composite/src/pixmapbinding/include/pixmapbinding.h

plugins/composite/src/pixmapbinding/src/

plugins/composite/src/pixmapbinding/src/pixmapbinding.cpp

plugins/composite/src/pixmapbinding/tests/

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

plugins/composite/src/pixmapbinding/tests/test-composite-pixmapbinding.cpp

plugins/composite/src/privates.h

plugins/composite/src/screen.cpp

plugins/composite/src/window.cpp

plugins/dbus/src/dbus.cpp

plugins/dbus/src/dbus.h

plugins/decor/CMakeLists.txt

plugins/decor/decor.xml.in

plugins/decor/src/compiz-decorator

plugins/decor/src/decor.cpp

plugins/mousepoll/mousepoll.xml.in

plugins/opengl/src/texture.cpp

plugins/opengl/src/window.cpp

plugins/place/src/place.cpp

plugins/wall/src/offset_movement/src/offset-movement.cpp

plugins/workspacenames/

plugins/workspacenames/CMakeLists.txt

plugins/workspacenames/src/

plugins/workspacenames/src/workspacenames.cpp

plugins/workspacenames/src/workspacenames.h

plugins/workspacenames/workspacenames.xml.in

src/CMakeLists.txt

src/plugin/CMakeLists.txt

src/plugin/tests/CMakeLists.txt

src/plugin/tests/test-loader.cpp

src/plugin/tests/test-plugin.cpp

src/privatescreen.h

src/privatescreen/tests/CMakeLists.txt

src/privatescreen/tests/test-privatescreen.cpp

src/privatestackdebugger.h

src/privatewindow.h

src/servergrab/

src/servergrab/CMakeLists.txt

src/servergrab/include/

src/servergrab/include/core/

src/servergrab/include/core/servergrab.h

src/servergrab/src/

src/servergrab/src/servergrab.cpp

src/servergrab/tests/

src/servergrab/tests/CMakeLists.txt

src/servergrab/tests/test-servergrab.cpp

src/stackdebugger.cpp

Older »