File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -69,11 +69,9 @@ before_install:
6969 # Lua is not installed on Travis OSX
7070 - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew install lua; export LUA_PREFIX=/usr/local; fi
7171
72- # Start virtual framebuffer to be able to test the GUI.
72+ # Start virtual framebuffer to be able to test the GUI. Does not work on OS X.
7373before_script :
74- - " export DISPLAY=:99.0"
75- - " sh -e /etc/init.d/xvfb start"
76- - sleep 3 # give xvfb some time to start
74+ - if [ "$TRAVIS_OS_NAME" = "linux" ]; then export DISPLAY=:99.0 && sh -e /etc/init.d/xvfb start && sleep 3; fi
7775
7876script :
7977 - NPROC=$(getconf _NPROCESSORS_ONLN)
Original file line number Diff line number Diff line change @@ -764,6 +764,8 @@ static char *(features[]) =
764764
765765static int included_patches [] =
766766{ /* Add new patch number below this line */
767+ /**/
768+ 80 ,
767769/**/
768770 79 ,
769771/**/
You can’t perform that action at this time.
0 commit comments