summaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorPeter Maydell2016-04-05 11:40:54 +0200
committerPeter Maydell2016-04-05 11:40:54 +0200
commit972e3ca3c1272419578627a107bdbc19a066c6ee (patch)
tree47d8be0f9981f3ebc82aa450c0f976dce9340dfc /docs
parentMerge remote-tracking branch 'remotes/dgibson/tags/ppc-for-2.6-20160405' into... (diff)
parent.travis.yml: make -j3 (diff)
downloadqemu-972e3ca3c1272419578627a107bdbc19a066c6ee.tar.gz
qemu-972e3ca3c1272419578627a107bdbc19a066c6ee.tar.xz
qemu-972e3ca3c1272419578627a107bdbc19a066c6ee.zip
Merge remote-tracking branch 'remotes/stsquad/tags/travis-pull-05042016' into staging
This pull request includes: - further collapse of the build matrix - enabling MacOSX in the build - make -j3 change Other pending updates are deferred for later in the cycle. # gpg: Signature made Tue 05 Apr 2016 10:11:25 BST using RSA key ID 5A9E2A44 # gpg: Good signature from "Alex Bennée (Master Work Key) <alex.bennee@linaro.org>" * remotes/stsquad/tags/travis-pull-05042016: .travis.yml: make -j3 .travis.yml: enable OSX builds .travis.yml: collapse the test matrix Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'docs')
0 files changed, 0 insertions, 0 deletions