← Back to branch summary

~andreas-pokorny/mir/reworked-external-output-centering-integration-branch

~andreas-pokorny/mir/reworked-external-output-centering-integration-branch

Viewing all changes in revision 2343.

Committer: Andreas Pokorny
Date: 2015-04-23 08:25:15 UTC
mfrom: (2323.22.157 dev)
Revision ID: andreas.pokorny@canonical.com-20150423082515-oy5rvpbfssd9t57b

merge lp:mir by essentially omitting most of the changes

files added:
doc/kernel_requirements.md

doc/snappy_appliances.md

snappy

snappy/CMakeLists.txt

snappy/copy-external-libs.sh

snappy/mir-demos.package.yaml.in

snappy/mir-run

snappy/mir.framework.in

snappy/mir.package.yaml.in

snappy/readme.md

tools/abi-check-mirclient-skip-symbols

tools/generate-abi-base-dump.sh

tools/run_abi_compliance_checker.sh

tools/tsan-suppressions

files removed:
tools/abi_dumps

files renamed:
cmake/FindGtest.cmake => cmake/FindGtestGmock.cmake

files modified:
CMakeLists.txt

cmake/ABICheck.cmake

cmake/MirCommon.cmake

cmake/src/mir/mir_discover_gtest_tests.cpp

doc/installing_prebuilt_on_android.md

doc/setup_kvm_for_mir.md

doc/using_mir_on_android.md

tools/process_doxygen_xml.py

tools/setup-partial-armhf-chroot.sh

tools/valgrind_suppressions_generic

Show diffs side-by-side

added added

removed removed

cmake/ABICheck.cmake

cmake/MirCommon.cmake

cmake/src/mir/mir_discover_gtest_tests.cpp

doc/installing_prebuilt_on_android.md

doc/kernel_requirements.md

doc/setup_kvm_for_mir.md

doc/snappy_appliances.md

doc/using_mir_on_android.md

snappy/CMakeLists.txt

snappy/copy-external-libs.sh

snappy/mir-demos.package.yaml.in

snappy/mir.framework.in

snappy/mir.package.yaml.in

snappy/readme.md

tools/abi-check-mirclient-skip-symbols

tools/abi_dumps/

tools/generate-abi-base-dump.sh

tools/process_doxygen_xml.py

tools/run_abi_compliance_checker.sh

tools/setup-partial-armhf-chroot.sh

tools/tsan-suppressions

tools/valgrind_suppressions_generic

Older »