Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
ThePhD 2016-02-27 02:44:13 -05:00
commit 95c63565a8

View File

@ -60,6 +60,7 @@ matrix:
- ninja-build
- libluajit-5.1-dev
# clang
- os: linux
env: COMPILER=clang++-3.5 LUA_VERSION=lua52
compiler: clang
@ -101,11 +102,25 @@ matrix:
- ninja-build
- libluajit-5.1-dev
- os: osx
osx_image: xcode7
compiler: gcc
env: COMPILER=g++-4.9 LUA_VERSION=lua53
- os: osx
osx_image: xcode7
compiler: gcc
env: COMPILER=g++-5 LUA_VERSION=lua53
- os: osx
osx_image: xcode7
compiler: clang
env: COMPILER=appleclang LUA_VERSION=lua53
allow_failures:
- os: osx
compiler: clang
before_install:
- source ./install.deps.sh