← Back to branch summary

~mir-team/mir/0.7

~mir-team/mir/0.7

Viewing all changes in revision 1758.3.6.

Committer: Daniel van Vugt
Date: 2014-07-11 03:33:03 UTC
mfrom: (1764 development-branch)
mto: This revision was merged to the branch mainline in revision 1766.
Revision ID: daniel.van.vugt@canonical.com-20140711033303-3ciaucybja2f5fui

Merge latest development-branch

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

include/shared/mir/recursive_read_write_mutex.h

src/shared/thread/recursive_read_write_mutex.cpp

tests/unit-tests/test_recursive_read_write_mutex.cpp

files renamed:
src/shared/threadname/ => src/shared/thread/

files modified:
debian/control

debian/rules

examples/eglcounter.cpp

examples/egltriangle.c

examples/minimal_server.cpp

examples/multiwin.c

include/test/mir_test_doubles/null_client_buffer.h

src/client/android/buffer.cpp

src/client/android/buffer.h

src/client/client_buffer.h

src/client/client_buffer_depository.cpp

src/client/mesa/client_buffer.cpp

src/client/mesa/client_buffer.h

src/server/CMakeLists.txt

src/server/scene/basic_surface.cpp

src/server/scene/basic_surface.h

src/server/scene/surface_stack.cpp

src/server/scene/surface_stack.h

src/shared/CMakeLists.txt

src/shared/thread/CMakeLists.txt

tests/mir_test_framework/testing_client_options.cpp

tests/unit-tests/CMakeLists.txt

tests/unit-tests/client/android/test_client_surface_interpreter.cpp

tests/unit-tests/client/mesa/test_native_surface.cpp

tests/unit-tests/client/test_aging_buffer.cpp

tests/unit-tests/client/test_client_buffer_depository.cpp

tests/unit-tests/client/test_client_mir_surface.cpp

tests/unit-tests/scene/test_basic_surface.cpp

tests/unit-tests/scene/test_surface_stack.cpp

Show diffs side-by-side

added added

removed removed

examples/eglcounter.cpp

examples/egltriangle.c

examples/minimal_server.cpp

examples/multiwin.c

include/shared/mir/basic_observers.h

include/shared/mir/recursive_read_write_mutex.h

include/test/mir_test_doubles/null_client_buffer.h

src/client/android/buffer.cpp

src/client/android/buffer.h

src/client/client_buffer.h

src/client/client_buffer_depository.cpp

src/client/mesa/client_buffer.cpp

src/client/mesa/client_buffer.h

src/server/CMakeLists.txt

src/server/scene/basic_surface.cpp

src/server/scene/basic_surface.h

src/server/scene/surface_stack.cpp

src/server/scene/surface_stack.h

src/shared/CMakeLists.txt

src/shared/thread/CMakeLists.txt

src/shared/thread/recursive_read_write_mutex.cpp

tests/mir_test_framework/testing_client_options.cpp

tests/unit-tests/CMakeLists.txt

tests/unit-tests/client/android/test_client_surface_interpreter.cpp

tests/unit-tests/client/mesa/test_native_surface.cpp

tests/unit-tests/client/test_aging_buffer.cpp

tests/unit-tests/client/test_client_buffer_depository.cpp

tests/unit-tests/client/test_client_mir_surface.cpp

tests/unit-tests/scene/test_basic_surface.cpp

tests/unit-tests/scene/test_surface_stack.cpp

tests/unit-tests/test_recursive_read_write_mutex.cpp

Older »