[Commits] [wesnoth/wesnoth] e8298c: fix travis test wrapper

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: e8298cff01b34891f9a813f8f01489d016183085
      https://github.com/wesnoth/wesnoth/commit/e8298cff01b34891f9a813f8f01489d016183085
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-07-05 (Sat, 05 Jul 2014)

  Changed paths:
    M utils/travis/test_wrapper.sh

  Log Message:
  -----------
  fix travis test wrapper

Apparently it doesn't like the "let" syntax for some reason


  Commit: 184691987fc61e87a7919e5a8d697147bdebd654
      https://github.com/wesnoth/wesnoth/commit/184691987fc61e87a7919e5a8d697147bdebd654
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-07-05 (Sat, 05 Jul 2014)

  Changed paths:
    M CMakeLists.txt
    M data/campaigns/Descent_Into_Darkness/maps/10_Alone_at_Last.map
    M data/campaigns/Descent_Into_Darkness/scenarios/09_A_Small_Favor3.cfg
    M data/campaigns/Descent_Into_Darkness/scenarios/10_Alone_at_Last.cfg
    M data/core/macros/utils.cfg
    M src/CMakeLists.txt
    A src/SDL_gpu/CMakeLists.txt
    A src/SDL_gpu/CMake_scripts/FindFFMPEG.cmake
    A src/SDL_gpu/CMake_scripts/FindOpenGLES.cmake
    A src/SDL_gpu/CMake_scripts/FindPkgMacros.cmake
    A src/SDL_gpu/CMake_scripts/FindSDL2.cmake
    A src/SDL_gpu/Doxyfile
    A src/SDL_gpu/README-wesnoth
    A src/SDL_gpu/README.txt
    A src/SDL_gpu/SDL_gpu/Android.mk
    A src/SDL_gpu/SDL_gpu/CMakeLists.txt
    A src/SDL_gpu/SDL_gpu/GLES_1/SDL_gpu_GLES_1.c
    A src/SDL_gpu/SDL_gpu/GLES_1/SDL_gpu_GLES_1.h
    A src/SDL_gpu/SDL_gpu/GLES_2/SDL_gpu_GLES_2.c
    A src/SDL_gpu/SDL_gpu/GLES_2/SDL_gpu_GLES_2.h
    A src/SDL_gpu/SDL_gpu/GL_common/SDL_gpuShapes_GL_common.inl
    A src/SDL_gpu/SDL_gpu/GL_common/SDL_gpu_GL_common.inl
    A src/SDL_gpu/SDL_gpu/GL_common/SDL_gpu_GL_matrix.c
    A src/SDL_gpu/SDL_gpu/GL_common/SDL_gpu_GL_matrix.h
    A src/SDL_gpu/SDL_gpu/OpenGL_1/SDL_gpu_OpenGL_1.c
    A src/SDL_gpu/SDL_gpu/OpenGL_1/SDL_gpu_OpenGL_1.h
    A src/SDL_gpu/SDL_gpu/OpenGL_1_BASE/SDL_gpu_OpenGL_1_BASE.c
    A src/SDL_gpu/SDL_gpu/OpenGL_1_BASE/SDL_gpu_OpenGL_1_BASE.h
    A src/SDL_gpu/SDL_gpu/OpenGL_2/SDL_gpu_OpenGL_2.c
    A src/SDL_gpu/SDL_gpu/OpenGL_2/SDL_gpu_OpenGL_2.h
    A src/SDL_gpu/SDL_gpu/OpenGL_3/SDL_gpu_OpenGL_3.c
    A src/SDL_gpu/SDL_gpu/OpenGL_3/SDL_gpu_OpenGL_3.h
    A src/SDL_gpu/SDL_gpu/SDL_gpu.c
    A src/SDL_gpu/SDL_gpu/SDL_gpu.h
    A src/SDL_gpu/SDL_gpu/SDL_gpuConfig.cmake
    A src/SDL_gpu/SDL_gpu/SDL_gpuShapes.c
    A src/SDL_gpu/SDL_gpu/SDL_gpu_Renderer.c
    A src/SDL_gpu/SDL_gpu/externals/glew/glew.c
    A src/SDL_gpu/SDL_gpu/externals/glew/glew.h
    A src/SDL_gpu/SDL_gpu/externals/glew/glxew.h
    A src/SDL_gpu/SDL_gpu/externals/glew/wglew.h
    A src/SDL_gpu/SDL_gpu/externals/stb_image/stb_image.c
    A src/SDL_gpu/SDL_gpu/externals/stb_image/stb_image.h
    A src/SDL_gpu/SDL_gpu/externals/stb_image/stb_image_write.c
    A src/SDL_gpu/SDL_gpu/externals/stb_image/stb_image_write.h
    A src/SDL_gpu/SDL_gpu/mainpage.dox
    M src/image.cpp
    M src/image.hpp
    M src/loadscreen.cpp
    M src/loadscreen.hpp
    A src/sdl/gpu.hpp
    M src/sdl/rect.cpp
    M src/sdl/rect.hpp
    M src/sdl/texture.cpp
    M src/sdl/texture.hpp
    M src/storyscreen/part.cpp
    M src/storyscreen/part.hpp
    M src/storyscreen/render.cpp
    M src/storyscreen/render.hpp
    M src/text.cpp
    M src/text.hpp
    M src/video.cpp
    M src/video.hpp

  Log Message:
  -----------
  Merge branch 'master' of git://github.com/wesnoth/wesnoth


Compare: https://github.com/wesnoth/wesnoth/compare/cdaab083d217...184691987fc6