← Back to branch summary

~vanvugt/mir/run-without-entropy

~vanvugt/mir/run-without-entropy

Viewing all changes in revision 3357.

Committer: Daniel van Vugt
Date: 2016-03-04 02:35:19 UTC
mfrom: (3337.2.17 test-without-entropy-more)
Revision ID: daniel.van.vugt@canonical.com-20160304023519-uljdr7tdt7ve3r2u

Merge latest trunk

files modified:
include/server/mir/input/input_device_hub.h

src/server/compositor/multi_monitor_arbiter.cpp

tests/unit-tests/compositor/test_multi_monitor_arbiter.cpp

Show diffs side-by-side

added added

removed removed

include/server/mir/input/input_device_hub.h

src/server/compositor/multi_monitor_arbiter.cpp

tests/unit-tests/compositor/test_multi_monitor_arbiter.cpp

Older »