From: Dale Weiler <weilercdale@gmail.com>
Date: Thu, 10 May 2018 01:19:39 +0000 (-0400)
Subject: Merge branch 'master' of github.com:graphitemaster/gmqcc
X-Git-Tag: xonotic-v0.8.5~20
X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fgmqcc.git;a=commitdiff_plain;h=c74fabffda68fb97716afe9d70744a071f717795;hp=092067482fddeccf1b3e42ff09a046f6555cd11e

Merge branch 'master' of github.com:graphitemaster/gmqcc
---

diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 830f373..0000000
--- a/.travis.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-language: cpp
-
-compiler:
-  - gcc
-  - clang
-
-before_install:
-  # g++4.8.1
-  - if [ "$CXX" == "g++" ]; then sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test; fi
-  # clang 3.4
-  - if [ "$CXX" == "clang++" ]; then sudo add-apt-repository -y ppa:h-rayflood/llvm; fi
-  - sudo apt-get update -qq
-
-install:
-  # g++4.8.1
-  - if [ "$CXX" = "g++" ]; then sudo apt-get install -qq g++-4.8; fi
-  - if [ "$CXX" = "g++" ]; then export CXX="g++-4.8"; fi
-  # clang 3.4
-  - if [ "$CXX" == "clang++" ]; then sudo apt-get install --allow-unauthenticated -qq clang-3.4; fi
-  - if [ "$CXX" == "clang++" ]; then export CXX="clang++-3.4"; fi
-
-script:
-    - make test
-
-notifications:
-    irc:
-        channels:
-          - "irc.freenode.org#gmqcc"
-        template:
-          - "[%{commit} : %{author}] %{message}"
-          - "%{build_url}"
-        skip_join: true