← Back to branch summary

~vanvugt/mir/fatal-error

~vanvugt/mir/fatal-error

Viewing all changes in revision 1651.

Committer: Daniel van Vugt
Date: 2014-05-23 03:56:46 UTC
mfrom: (1623.1.32 development-branch)
Revision ID: daniel.van.vugt@canonical.com-20140523035646-833v0op4ot6fnzi1

Merge latest development-branch

files modified:
examples/eglapp.c

include/client/mir_toolkit/mir_surface.h

include/shared/mir_toolkit/common.h

src/client/mir_surface.cpp

src/client/mir_surface_api.cpp

src/client/rpc/mir_socket_rpc_channel.cpp

src/server/frontend/socket_messenger.cpp

src/server/scene/basic_surface.cpp

src/server/scene/basic_surface.h

tests/acceptance-tests/test_client_library.cpp

tests/unit-tests/scene/test_surface_impl.cpp

Show diffs side-by-side

added added

removed removed

examples/eglapp.c

include/client/mir_toolkit/mir_surface.h

include/shared/mir_toolkit/common.h

src/client/mir_surface.cpp

src/client/mir_surface_api.cpp

src/client/rpc/mir_socket_rpc_channel.cpp

src/server/frontend/socket_messenger.cpp

src/server/scene/basic_surface.cpp

src/server/scene/basic_surface.h

tests/acceptance-tests/test_client_library.cpp

tests/unit-tests/scene/test_surface_impl.cpp

Older »