Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'remotes/stsquad/tags/travis-pull-050420…
…16' 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>
- Loading branch information
Showing
1 changed file
with
24 additions
and
58 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters