diff options
| author | Ray <raysan5@gmail.com> | 2015-01-10 13:28:45 +0100 |
|---|---|---|
| committer | Ray <raysan5@gmail.com> | 2015-01-10 13:28:45 +0100 |
| commit | cae6f3c613794e5e02233aa1590eb1ea9a8239cd (patch) | |
| tree | 762e1968f407c420021aa43a044c03179b56e0d5 /external/glfw3 | |
| parent | 274921cd353cf64f124bfc9b986bf793c72d4ffa (diff) | |
| parent | bb8c1826d3d3c02cc8e91d6187cd5035a440a6ac (diff) | |
| download | raylib-1.2.2-installer.tar.gz raylib-1.2.2-installer.zip | |
Merge pull request #16 from raysan5/develop1.2.2-installer
Integration from develop branch to master
Diffstat (limited to 'external/glfw3')
| l--------- | external/glfw3/lib/libglfw.3.dylib | 1 | ||||
| l--------- | external/glfw3/lib/libglfw.dylib | 1 | ||||
| -rw-r--r--[-rwxr-xr-x] | external/glfw3/lib/osx/libglfw.3.0.dylib (renamed from external/glfw3/lib/libglfw.3.0.dylib) | bin | 127856 -> 127856 bytes | |||
| -rw-r--r-- | external/glfw3/lib/osx/libglfw.3.dylib | 1 | ||||
| -rw-r--r-- | external/glfw3/lib/osx/libglfw.dylib | 1 | ||||
| -rw-r--r-- | external/glfw3/lib/win32/libglfw3.a (renamed from external/glfw3/lib/libglfw3.a) | bin | 83006 -> 83006 bytes | |||
| -rw-r--r-- | external/glfw3/lib/win32/libglfw3dll.a (renamed from external/glfw3/lib/libglfw3dll.a) | bin | 48318 -> 48318 bytes |
7 files changed, 2 insertions, 2 deletions
diff --git a/external/glfw3/lib/libglfw.3.dylib b/external/glfw3/lib/libglfw.3.dylib deleted file mode 120000 index cd20112e..00000000 --- a/external/glfw3/lib/libglfw.3.dylib +++ /dev/null @@ -1 +0,0 @@ -libglfw.3.0.dylib
\ No newline at end of file diff --git a/external/glfw3/lib/libglfw.dylib b/external/glfw3/lib/libglfw.dylib deleted file mode 120000 index d4bd51e1..00000000 --- a/external/glfw3/lib/libglfw.dylib +++ /dev/null @@ -1 +0,0 @@ -libglfw.3.dylib
\ No newline at end of file diff --git a/external/glfw3/lib/libglfw.3.0.dylib b/external/glfw3/lib/osx/libglfw.3.0.dylib Binary files differindex 963d716d..15674573 100755..100644 --- a/external/glfw3/lib/libglfw.3.0.dylib +++ b/external/glfw3/lib/osx/libglfw.3.0.dylib diff --git a/external/glfw3/lib/osx/libglfw.3.dylib b/external/glfw3/lib/osx/libglfw.3.dylib new file mode 100644 index 00000000..cd20112e --- /dev/null +++ b/external/glfw3/lib/osx/libglfw.3.dylib @@ -0,0 +1 @@ +libglfw.3.0.dylib
\ No newline at end of file diff --git a/external/glfw3/lib/osx/libglfw.dylib b/external/glfw3/lib/osx/libglfw.dylib new file mode 100644 index 00000000..d4bd51e1 --- /dev/null +++ b/external/glfw3/lib/osx/libglfw.dylib @@ -0,0 +1 @@ +libglfw.3.dylib
\ No newline at end of file diff --git a/external/glfw3/lib/libglfw3.a b/external/glfw3/lib/win32/libglfw3.a Binary files differindex 7138ee9b..7138ee9b 100644 --- a/external/glfw3/lib/libglfw3.a +++ b/external/glfw3/lib/win32/libglfw3.a diff --git a/external/glfw3/lib/libglfw3dll.a b/external/glfw3/lib/win32/libglfw3dll.a Binary files differindex 415d8563..415d8563 100644 --- a/external/glfw3/lib/libglfw3dll.a +++ b/external/glfw3/lib/win32/libglfw3dll.a |