← Back to branch summary

~alan-griffiths/mir/fix-1201436

~alan-griffiths/mir/fix-1201436

Viewing all changes in revision 1099.

Committer: Alan Griffiths
Date: 2013-10-01 16:23:33 UTC
mfrom: (1095.1.2 development-branch)
Revision ID: alan@octopull.co.uk-20131001162333-kvpua25hdhdes3il

merge lp:~mir-team/mir/development-branch

files added:
include/server/mir/logging/connector_report.h

src/server/logging/connector_report.cpp

files modified:
include/server/mir/default_server_configuration.h

include/server/mir/frontend/connector_report.h

src/server/default_server_configuration.cpp

src/server/frontend/default_configuration.cpp

src/server/frontend/published_socket_connector.cpp

src/server/frontend/published_socket_connector.h

src/server/logging/CMakeLists.txt

tests/unit-tests/frontend/test_published_socket_connector.cpp

Show diffs side-by-side

added added

removed removed

include/server/mir/default_server_configuration.h

include/server/mir/frontend/connector_report.h

include/server/mir/logging/connector_report.h

src/server/default_server_configuration.cpp

src/server/frontend/default_configuration.cpp

src/server/frontend/published_socket_connector.cpp

src/server/frontend/published_socket_connector.h

src/server/logging/CMakeLists.txt

src/server/logging/connector_report.cpp

tests/unit-tests/frontend/test_published_socket_connector.cpp

Older »