Merge branch 'develop' of https://github.com/raysan5/raylib into develop

raysan5 · Feb 4, 2018 · 5437458 · 5437458
2 parents 3a11cc5 + 327aec9
commit 5437458
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -13,7 +13,7 @@ matrix:
       env: ARCH=i386
       sudo: required
     - os: linux
-      env: ARCH=amd64 GLFW=SYSTEM
+      env: ARCH=amd64
       sudo: required
     - os: osx
       env: ARCH=universal

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -2,7 +2,7 @@
 project(raylib)
 include("../utils.cmake")
 
-set(PROJECT_VERSION 1.9.2)
+set(PROJECT_VERSION 1.9.4)
 set(API_VERSION 1)
 set(RAYLIB raylib)    # Name of the generated library
 

diff --git a/src/Makefile b/src/Makefile
@@ -44,7 +44,7 @@
 # Define required raylib variables
 PLATFORM          ?= PLATFORM_DESKTOP
 RAYLIB_PATH        = ..
-RAYLIB_VERSION     = 1.9.2
+RAYLIB_VERSION     = 1.9.4
 RAYLIB_API_VERSION = 1
 # Library type used for raylib: STATIC (.a) or SHARED (.so/.dll)
 RAYLIB_LIBTYPE    ?= STATIC