← Back to branch summary

~robertcarr/mir/prepare-session-manager-for-input-focus

~robertcarr/mir/prepare-session-manager-for-input-focus

Viewing all changes in revision 471.

Committer: Robert Carr
Date: 2013-03-11 22:21:53 UTC
mfrom: (467.1.19 trunk)
Revision ID: robert.carr@canonical.com-20130311222153-mjbz9h690w3742ih

Merge trunk

files added:
debian/mir-doc.install

doc/building_source_for_pc.md

doc/installing_prebuilt_on_android.md

doc/installing_prebuilt_on_pc.md

doc/using_mir_on_android.md

doc/using_mir_on_pc.md

files removed:
tests/unit-tests/compositor/test_basic_buffer.cpp

files modified:
cmake/Doxygen.cmake

debian/control

debian/rules

doc/mainpage.md

include/mir/display_server.h

src/display_server.cpp

src/main.cpp

tests/mir_test_framework/testing_process_manager.cpp

tests/unit-tests/compositor/CMakeLists.txt

Show diffs side-by-side

added added

removed removed

cmake/Doxygen.cmake

debian/mir-doc.install

doc/building_source_for_pc.md

doc/installing_prebuilt_on_android.md

doc/installing_prebuilt_on_pc.md

doc/mainpage.md

doc/using_mir_on_android.md

doc/using_mir_on_pc.md

include/mir/display_server.h

src/display_server.cpp

tests/mir_test_framework/testing_process_manager.cpp

tests/unit-tests/compositor/CMakeLists.txt

tests/unit-tests/compositor/test_basic_buffer.cpp

Older »