← Back to branch summary

~vanvugt/mir/fatal-error

~vanvugt/mir/fatal-error

Viewing all changes in revision 1655.

Committer: Daniel van Vugt
Date: 2014-07-08 03:12:32 UTC
mfrom: (1623.1.127 development-branch)
Revision ID: daniel.van.vugt@canonical.com-20140708031232-ix2dx6ycexohb5xk

Merge latest development-branch and fix a conflict.

files added:
src/server/default_emergency_cleanup.cpp

src/server/default_emergency_cleanup.h

tests/unit-tests/test_default_emergency_cleanup.cpp

files removed:
tests/unit-tests/frontend/test_protobuf_sends_fds.cpp

files modified:
src/server/CMakeLists.txt

src/server/default_server_configuration.cpp

src/server/frontend/protobuf_message_processor.cpp

src/server/scene/basic_surface.cpp

src/shared/protobuf/mir_protobuf.proto

tests/integration-tests/test_error_reporting.cpp

tests/unit-tests/CMakeLists.txt

tests/unit-tests/compositor/test_buffer_queue.cpp

tests/unit-tests/frontend/CMakeLists.txt

tests/unit-tests/frontend/test_protobuf_reports_errors.cpp

tests/unit-tests/scene/test_basic_surface.cpp

Show diffs side-by-side

added added

removed removed

src/server/CMakeLists.txt

src/server/default_emergency_cleanup.cpp

src/server/default_emergency_cleanup.h

src/server/default_server_configuration.cpp

src/server/frontend/protobuf_message_processor.cpp

src/server/scene/basic_surface.cpp

src/shared/protobuf/mir_protobuf.proto

tests/integration-tests/test_error_reporting.cpp

tests/unit-tests/CMakeLists.txt

tests/unit-tests/compositor/test_buffer_queue.cpp

tests/unit-tests/frontend/CMakeLists.txt

tests/unit-tests/frontend/test_protobuf_reports_errors.cpp

tests/unit-tests/frontend/test_protobuf_sends_fds.cpp

tests/unit-tests/scene/test_basic_surface.cpp

tests/unit-tests/test_default_emergency_cleanup.cpp

Older »