← Back to branch summary

~vanvugt/mir/parenting-client-api

~vanvugt/mir/parenting-client-api

Viewing all changes in revision 2046.

Committer: Daniel van Vugt
Date: 2014-11-11 07:54:25 UTC
mfrom: (2002.1.42 development-branch)
Revision ID: daniel.van.vugt@canonical.com-20141111075425-3fd72nnksjh22h5a

Merge latest trunk and fix a conflict

files removed:
tests/unit-tests/scene/test_surface_allocator.cpp

files modified:
src/client/mir_surface_api.cpp

src/include/server/mir/glib_main_loop.h

src/include/server/mir/glib_main_loop_sources.h

src/server/glib_main_loop.cpp

src/server/glib_main_loop_sources.cpp

tests/acceptance-tests/test_client_input.cpp

tests/integration-tests/test_stale_frames.cpp

tests/unit-tests/test_glib_main_loop.cpp

tools/install_on_android.sh

Show diffs side-by-side

added added

removed removed

src/client/mir_surface_api.cpp

src/include/server/mir/glib_main_loop.h

src/include/server/mir/glib_main_loop_sources.h

src/server/glib_main_loop.cpp

src/server/glib_main_loop_sources.cpp

tests/acceptance-tests/test_client_input.cpp

tests/integration-tests/test_stale_frames.cpp

tests/unit-tests/scene/test_surface_allocator.cpp

tests/unit-tests/test_glib_main_loop.cpp

tools/install_on_android.sh

Older »