Merge branch 'master' into sdl2

Conflicts: Makefile code/renderercommon/qgl.h code/renderergl1/tr_local.h code/sdl/sdl_glimp.c
ioquake · May 8, 2013 · d9d52f0 · d9d52f0
2 parents b9355c5 + 42eeb75
commit d9d52f0
Show file tree

Hide file tree

Showing 427 changed files with 66,043 additions and 14,044 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,15 @@
+language: c
+compiler:
+  - gcc
+  - clang
+  - i686-w64-mingw32-gcc
+
+script: ./travis-ci-build.sh
+
+before_install:
+  - sudo apt-get update -qq
+  - sudo apt-get remove -qq -y mingw32
+  - sudo apt-get install -q -y libgl1-mesa-dev libsdl1.2-dev libvorbis-dev libfreetype6-dev mingw-w64
+
+notifications:
+  email: false