Merge branch 'master' into ChaiScript_5_0_CPP_11
Conflicts: .travis.yml
This commit is contained in:
commit
4bdf854a9c
@ -1,7 +1,6 @@
|
|||||||
language: cpp
|
language: cpp
|
||||||
compiler:
|
compiler:
|
||||||
- gcc
|
- gcc
|
||||||
- clang
|
|
||||||
script:
|
script:
|
||||||
- mkdir build
|
- mkdir build
|
||||||
- cd build
|
- cd build
|
||||||
|
Loading…
x
Reference in New Issue
Block a user