Viewing all changes in revision 4154.2.63.
- Committer: Christopher James Halse Rogers
- Date: 2017-09-07 05:58:13 UTC
- mfrom: (4242 development-branch)
- mto: (4243.1.1 mir3)
- mto: This revision was merged to the branch mainline in revision 4244.
- Revision ID: christopher.halse.rogers@canonical.com-20170907055813-4qsg25nirybc8jj3
Merge trunk, resolving conflict
- files added:
- cmake/FindPIL.cmake
- examples/miral-kiosk
- examples/miral-shell
- examples/miral-shell/desktop
- examples/miral-shell/spinner
- include/miral
- include/miral/mir
- include/miral/mir/client
- include/miral/miral
- include/test/mir/shell
- src/miral
- tests/miral
- files removed:
- examples/cursor-theme-dump.cpp
- playground/demo-shell
- playground/demo-shell/typo
- files renamed:
- include/platform/mir/abnormal_exit.h => include/core/mir/abnormal_exit.h
- include/server/mir/shell/basic_window_manager.h => include/test/mir/shell/basic_window_manager.h
- include/server/mir/shell/canonical_window_manager.h => include/test/mir/shell/canonical_window_manager.h
- src/server/shell/basic_window_manager.cpp => tests/mir_test_framework/basic_window_manager.cpp
- src/server/shell/canonical_window_manager.cpp => tests/mir_test_framework/canonical_window_manager.cpp
- files modified:
- CMakeLists.txt
expand all
collapse all
added
removed
examples/miral-shell/desktop/ubuntu-logo.svg
examples/miral-shell/spinner/spinner-glow.png
examples/miral-shell/spinner/spinner-logo.png
