From: Lyberta <lyberta@lyberta.net>
Date: Sun, 5 Jan 2020 00:42:00 +0000 (+0300)
Subject: Merge branch 'div0-stable' into Lyberta/libgmp
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=0529917423fc59ad87a97e43ac3aef95d1028cfa;p=xonotic%2Fdarkplaces.git

Merge branch 'div0-stable' into Lyberta/libgmp
---

0529917423fc59ad87a97e43ac3aef95d1028cfa
diff --cc .travis.yml
index 9ea2b34d,fbea9bb7..6cab6239
--- a/.travis.yml
+++ b/.travis.yml
@@@ -29,8 -33,9 +34,10 @@@ matrix
          packages:
            - libxpm-dev
            - libsdl1.2-dev
+           - libxi-dev
+           - libxrandr-dev
            - libxxf86vm-dev
 +          - libgmp-dev
    - os: linux
      env: PROJECT=xonotic OS="win32"
      compiler: gcc