aboutsummaryrefslogtreecommitdiff
path: root/src_android
diff options
context:
space:
mode:
authorRay <raysan5@gmail.com>2015-01-08 20:32:30 +0100
committerRay <raysan5@gmail.com>2015-01-08 20:32:30 +0100
commite37ef10595867e4f189fff0f87db5e6fdfcfc4d0 (patch)
tree0410f5604cc3cfc036f6c1f3ac4333ac33726660 /src_android
parentfad81f36e4cfd37901caad8555c49c41ac65aaee (diff)
parent4a7e522d4bb376d2277895d1d99eb0382f8bbefb (diff)
downloadraylib-e37ef10595867e4f189fff0f87db5e6fdfcfc4d0.tar.gz
raylib-e37ef10595867e4f189fff0f87db5e6fdfcfc4d0.zip
Merge pull request #14 from raysan5/master
Integrate master into develop branch
Diffstat (limited to 'src_android')
-rw-r--r--src_android/jni/Android.mk1
1 files changed, 0 insertions, 1 deletions
diff --git a/src_android/jni/Android.mk b/src_android/jni/Android.mk
index 56316b17..73a2cc7f 100644
--- a/src_android/jni/Android.mk
+++ b/src_android/jni/Android.mk
@@ -40,7 +40,6 @@ LOCAL_SRC_FILES :=\
../../src/core.c \
../../src/rlgl.c \
../../src/raymath.c \
- ../../src/stb_image.c \
../../src/textures.c \
../../src/text.c \
../../src/shapes.c \