← Back to branch summary

~kdub/mir/refcounted-fds

~kdub/mir/refcounted-fds

Viewing all changes in revision 1785.

Committer: Kevin DuBois
Date: 2014-07-14 14:01:07 UTC
mfrom: (1762.1.8 development-branch)
Revision ID: kevin.dubois@canonical.com-20140714140107-ra0h8r7v68khqais

merge devel

files added:
tests/acceptance-tests/test_client_with_custom_display_config_deadlock.cpp

tests/unit-tests/test_basic_observers.cpp

files modified:
include/shared/mir/basic_observers.h

include/shared/mir_toolkit/event.h

src/server/asio_main_loop.cpp

src/server/compositor/buffer_queue.h

src/server/compositor/timeout_frame_dropping_policy_factory.cpp

tests/acceptance-tests/CMakeLists.txt

tests/unit-tests/CMakeLists.txt

Show diffs side-by-side

added added

removed removed

include/shared/mir/basic_observers.h

include/shared/mir_toolkit/event.h

src/server/asio_main_loop.cpp

src/server/compositor/buffer_queue.h

src/server/compositor/timeout_frame_dropping_policy_factory.cpp

tests/acceptance-tests/CMakeLists.txt

tests/acceptance-tests/test_client_with_custom_display_config_deadlock.cpp

tests/unit-tests/CMakeLists.txt

tests/unit-tests/test_basic_observers.cpp

Older »