Merge branch 'master' into skybox-hotfix

This commit is contained in:
Alam Ed Arias 2016-03-07 16:18:00 -05:00
commit e21776a511

View file

@ -23,7 +23,7 @@ addons:
- p7zip-full
before_script:
- mkdir $HOME/srb2_cache
- mkdir -p $HOME/srb2_cache
- 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