aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2016-04-05 10:40:54 +0100
committerPeter Maydell <peter.maydell@linaro.org>2016-04-05 10:40:54 +0100
commit972e3ca3c1272419578627a107bdbc19a066c6ee (patch)
tree47d8be0f9981f3ebc82aa450c0f976dce9340dfc /include
parent1dbc7cc9b91ba229ec958418bef483364f06fe72 (diff)
parent7436268ce7062b32af1d07a392e00f0c3ae664cd (diff)
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 'include')
0 files changed, 0 insertions, 0 deletions