Merge branch 'master' into ChaiScript_5_0_CPP_11

Conflicts:
	.travis.yml
This commit is contained in:
Jason Turner 2014-03-10 14:31:58 -06:00
commit b0a882d57e

View File

@ -5,7 +5,8 @@ compiler:
script: script:
- mkdir build - mkdir build
- cd build - cd build
- cmake ../build - cmake ../
- make
- make test - make test
notifications: notifications:
recipients: recipients: