Merge branch 'master' into ChaiScript_5_0_CPP_11

Conflicts: .travis.yml
2014-03-10 14:49:47 -06:00 · 2014-03-10 14:49:47 -06:00 · 4bdf854a9c
commit 4bdf854a9c
parent b0a882d57e 0162757158
1 changed files with 0 additions and 1 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -1,7 +1,6 @@
 language: cpp
 compiler:
  - gcc
-  - clang
 script: 
  - mkdir build
  - cd build