xserver: Branch 'master'

[Adam Jackson]

 .travis.yml |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0c3ad9d1e06294b4f66717798afa4f5dfa505469
Author: Adam Jackson <ajax at redhat.com>
Date:   Mon Oct 23 15:34:26 2017 -0400

    travis: Bump linux Dockerfile to v7 for new meson
    
    Signed-off-by: Adam Jackson <ajax at redhat.com>

diff --git a/.travis.yml b/.travis.yml
index 856360e27..81ca9e70a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,7 +15,7 @@ install:
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then HOMEBREW_NO_AUTO_UPDATE=1 brew install ccache ; fi
 
 before_script:
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then echo FROM anholt/xserver-travis:v6 > Dockerfile ; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then echo FROM anholt/xserver-travis:v7 > Dockerfile ; fi
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then echo ADD . /root >> Dockerfile ; fi
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker build -t withgit . ; fi