Merge branch 'develop' of https://github.com/dfhack/dfhack into develop

2015-09-21 19:25:58 -04:00 · 2015-09-21 19:25:58 -04:00 · 60ed4a1a50
parent 62c903b7be 3a75d9c87f
commit 60ed4a1a50
1 changed files with 9 additions and 2 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -1,10 +1,17 @@
 sudo: false
 addons:
  apt:
    packages:
    - lua5.2
 #    - python3-docutils
 language: cpp
 env:
  matrix:
    -LUA_VERSION=5.2
 before_install:
- sudo apt-get install lua$LUA_VERSION
+#- sudo apt-get install lua$LUA_VERSION
- sudo pip install docutils
+#- sudo pip install docutils
  pip install --user docutils
 script:
 - python travis/pr-check-base.py
 - python travis/lint.py