Viewing all changes in revision 428.2.19.
- Committer: Daniel van Vugt
- Date: 2013-03-07 08:04:05 UTC
- mfrom: (467.1.6 trunk)
- mto: (467.1.21 trunk)
- mto: This revision was merged to the branch mainline in revision 486.
- Revision ID: daniel.van.vugt@canonical.com-20130307080405-vgn5g2ts7j08xekk
Merge latest lp:mir
- files added:
- 3rd_party/android-deps/androidfw
- 3rd_party/android-deps/sync
- include/mir_toolkit/input
- files removed:
- 3rd_party/android-deps/android/input.h
- files renamed:
- 3rd_party/android-input/android/frameworks/native/include/android/input.h => 3rd_party/android-deps/android/input.h
- 3rd_party/android-input/android/frameworks/native/include/android/keycodes.h => 3rd_party/android-deps/android/keycodes.h
- 3rd_party/android-input/android/system/core/include/android/log.h => 3rd_party/android-deps/android/log.h
- 3rd_party/android-input/android/frameworks/native/include/android/looper.h => 3rd_party/android-deps/android/looper.h
- 3rd_party/android-input/android/frameworks/base/include/androidfw/Platform.h => 3rd_party/android-deps/androidfw/Platform.h
- 3rd_party/android-input/android/system/core/include/cutils/atomic.h => 3rd_party/android-deps/cutils/atomic.h
- 3rd_party/android-input/android/system/core/include/cutils/log.h => 3rd_party/android-deps/cutils/log.h
- 3rd_party/android-input/android/frameworks/base/include/std/ => 3rd_party/android-deps/std/
- 3rd_party/android-input/android/system/core/include/system/graphics.h => 3rd_party/android-deps/system/graphics.h
- 3rd_party/android-input/android/frameworks/native/include/utils/Condition.h => 3rd_party/android-deps/utils/Condition.h
- 3rd_party/android-input/android/frameworks/native/include/utils/Errors.h => 3rd_party/android-deps/utils/Errors.h
- 3rd_party/android-input/android/frameworks/native/include/utils/KeyedVector.h => 3rd_party/android-deps/utils/KeyedVector.h
- 3rd_party/android-input/android/frameworks/native/include/utils/Mutex.h => 3rd_party/android-deps/utils/Mutex.h
- 3rd_party/android-input/android/frameworks/native/include/utils/RefBase.h => 3rd_party/android-deps/utils/RefBase.h
- 3rd_party/android-input/android/frameworks/native/include/utils/SharedBuffer.h => 3rd_party/android-deps/utils/SharedBuffer.h
- 3rd_party/android-input/android/frameworks/native/include/utils/SortedVector.h => 3rd_party/android-deps/utils/SortedVector.h
- 3rd_party/android-input/android/frameworks/native/include/utils/String16.h => 3rd_party/android-deps/utils/String16.h
- 3rd_party/android-input/android/frameworks/native/include/utils/String8.h => 3rd_party/android-deps/utils/String8.h
- 3rd_party/android-input/android/frameworks/native/include/utils/StrongPointer.h => 3rd_party/android-deps/utils/StrongPointer.h
- 3rd_party/android-input/android/frameworks/native/include/utils/Timers.h => 3rd_party/android-deps/utils/Timers.h
- 3rd_party/android-input/android/frameworks/native/include/utils/TypeHelpers.h => 3rd_party/android-deps/utils/TypeHelpers.h
- 3rd_party/android-input/android/frameworks/native/include/utils/Unicode.h => 3rd_party/android-deps/utils/Unicode.h
- 3rd_party/android-input/android/frameworks/native/include/utils/Vector.h => 3rd_party/android-deps/utils/Vector.h
- 3rd_party/android-input/android/frameworks/native/include/utils/VectorImpl.h => 3rd_party/android-deps/utils/VectorImpl.h
- 3rd_party/android-input/android/frameworks/native/include/utils/threads.h => 3rd_party/android-deps/utils/threads.h
- design/Architectue.dia => design/Architecture.dia
- include/mir/frontend/application_listener.h => include/mir/frontend/application_mediator_report.h
- include/mir/graphics/display_listener.h => include/mir/graphics/display_report.h
- include/mir_test_doubles/null_display_listener.h => include/mir/graphics/null_display_report.h
- src/graphics/gbm/gbm_display_reporter.h => include/mir/logging/display_report.h
- include/mir/sessions/ => include/mir/shell/
- include/mir/compositor/buffer_bundle.h => include/mir/surfaces/buffer_bundle.h
- include/mir/compositor/buffer_bundle_factory.h => include/mir/surfaces/buffer_bundle_factory.h
- include/mir/compositor/graphic_region.h => include/mir/surfaces/graphic_region.h
- include/mir_test_doubles/mock_display_listener.h => include/mir_test_doubles/mock_display_report.h
- include/mir_client/ => include/mir_toolkit/
- include/mir/input/event.h => include/mir_toolkit/input/event.h
- src/compositor/buffer_bundle.cpp => src/compositor/buffer_bundle_surfaces.cpp
- src/server_configuration.cpp => src/default_server_configuration.cpp
- src/frontend/null_application_listener.cpp => src/frontend/null_application_mediator_report.cpp
- src/graphics/gbm/gbm_display_reporter.cpp => src/logging/display_report.cpp
- src/sessions/ => src/shell/
- tests/integration-tests/frontend/test_application_listener.cpp => tests/integration-tests/frontend/test_application_mediator_report.cpp
- files modified:
- 3rd_party/CMakeLists.txt
expand all
collapse all
added
removed
