← Back to branch summary

~robertcarr/+junk/printstuff

~robertcarr/+junk/printstuff

Viewing all changes in revision 1071.

Committer: Robert Carr
Date: 2013-09-20 19:13:56 UTC
mfrom: (1063.2.10 trunk)
Revision ID: robert.carr@canonical.com-20130920191356-i8wfedgtywj90krb

Merge trunk

files added:
include/server/mir/default_pause_resume_listener.h

include/server/mir/pause_resume_listener.h

include/test/mir_test_doubles/mock_pause_resume_listener.h

files modified:
3rd_party/android-input/README

3rd_party/android-input/android/frameworks/base/services/input/InputReader.h

examples/demo-inprocess-surface-client/inprocess_egl_client.cpp

examples/eglapp.c

examples/fingerpaint.c

examples/render_surfaces.cpp

examples/render_to_fb.cpp

include/platform/mir/graphics/native_platform.h

include/server/mir/default_server_configuration.h

include/server/mir/server_configuration.h

src/server/default_server_configuration.cpp

src/server/display_server.cpp

src/server/graphics/android/android_platform.cpp

src/server/graphics/android/android_platform.h

src/server/graphics/gbm/native_gbm_platform.cpp

src/server/graphics/gbm/native_gbm_platform.h

src/server/graphics/nested/nested_display.cpp

src/server/graphics/nested/nested_display.h

src/server/graphics/nested/nested_output.cpp

src/server/graphics/nested/nested_output.h

src/server/graphics/nested/nested_platform.cpp

tests/acceptance-tests/test_nested_mir.cpp

tests/integration-tests/test_display_server_main_loop_events.cpp

Show diffs side-by-side

added added

removed removed

3rd_party/android-input/README

3rd_party/android-input/android/frameworks/base/services/input/InputReader.h

examples/demo-inprocess-surface-client/inprocess_egl_client.cpp

examples/eglapp.c

examples/fingerpaint.c

examples/render_surfaces.cpp

examples/render_to_fb.cpp

include/platform/mir/graphics/native_platform.h

include/server/mir/default_pause_resume_listener.h

include/server/mir/default_server_configuration.h

include/server/mir/pause_resume_listener.h

include/server/mir/server_configuration.h

include/test/mir_test_doubles/mock_pause_resume_listener.h

src/server/default_server_configuration.cpp

src/server/display_server.cpp

src/server/graphics/android/android_platform.cpp

src/server/graphics/android/android_platform.h

src/server/graphics/gbm/native_gbm_platform.cpp

src/server/graphics/gbm/native_gbm_platform.h

src/server/graphics/nested/nested_display.cpp

src/server/graphics/nested/nested_display.h

src/server/graphics/nested/nested_output.cpp

src/server/graphics/nested/nested_output.h

src/server/graphics/nested/nested_platform.cpp

tests/acceptance-tests/test_nested_mir.cpp

tests/integration-tests/test_display_server_main_loop_events.cpp

Older »