Merge branch 'master' into next

This commit is contained in:
Alam Ed Arias 2016-02-26 01:56:27 -05:00
commit 6655e92410
1 changed files with 3 additions and 3 deletions

View File

@ -11,7 +11,7 @@ compiler:
cache:
directories:
- $HOME/srb2_cache
- $HOME/srb2_cache
addons:
apt:
@ -24,8 +24,8 @@ addons:
before_script:
- mkdir $HOME/srb2_cache
- wget http://rosenthalcastle.org/srb2/SRB2-v2114-Installer.exe -c -O $HOME/srb2_cache/SRB2-v2114-Installer.exe
- 7z x $HOME/srb2_cache/SRB2-v2114-Installer.exe -oassets
- wget --verbose --server-response -c http://rosenthalcastle.org/srb2/SRB2-v2114-assets.7z -O $HOME/srb2_cache/SRB2-v2114-assets.7z
- 7z x $HOME/srb2_cache/SRB2-v2114-assets.7z -oassets
- mkdir build
- cd build
- cmake ..