← Back to branch summary

~andreas-pokorny/mir/09-input-config-authorizer

~andreas-pokorny/mir/09-input-config-authorizer

Viewing all changes in revision 3810.

Committer: Andreas Pokorny
Date: 2016-11-15 21:00:10 UTC
mfrom: (3806.1.1 08-csdi-forward-input-device-configuration-in-nested-server)
Revision ID: andreas.pokorny@canonical.com-20161115210010-18wm360x3a2k5xbl

resolve conflicts

files added:
src/include/client/mir_toolkit/extensions

src/include/client/mir_toolkit/extensions/android_egl.h

files removed:
src/include/server/mir/frontend/unsupported_feature_exception.h

files renamed:
src/client/mir_buffer.h => src/include/client/mir/mir_buffer.h

files modified:
debian/rules

playground/diamond.c

playground/diamond.h

playground/egldiamond_render_surface.c

playground/mir_egl_platform_shim.c

playground/mir_egl_platform_shim.h

src/client/buffer.h

src/client/error_buffer.h

src/client/mir_presentation_chain.h

src/platforms/android/client/android_client_platform.cpp

src/platforms/android/client/android_client_platform.h

src/server/frontend/protobuf_message_processor.cpp

src/server/scene/unsupported_coordinate_translator.cpp

tests/include/mir/test/doubles/mock_mir_buffer.h

Show diffs side-by-side

added added

removed removed

playground/diamond.c

playground/diamond.h

playground/egldiamond_render_surface.c

playground/mir_egl_platform_shim.c

playground/mir_egl_platform_shim.h

src/client/buffer.h

src/client/error_buffer.h

src/client/mir_presentation_chain.h

src/include/client/mir_toolkit/extensions/

src/include/client/mir_toolkit/extensions/android_egl.h

src/include/server/mir/frontend/unsupported_feature_exception.h

src/platforms/android/client/android_client_platform.cpp

src/platforms/android/client/android_client_platform.h

src/server/frontend/protobuf_message_processor.cpp

src/server/scene/unsupported_coordinate_translator.cpp

tests/include/mir/test/doubles/mock_mir_buffer.h

Older »