Skip to content

Commit

Permalink
Merge commit 'e9790820903f7e349afc65706f0a4cbec2c48d49'
Browse files Browse the repository at this point in the history
  • Loading branch information
@Sibras
Sibras committed Sep 27, 2016
2 parents aedbf0e + e979082 commit 70a047d
Show file tree
Hide file tree
Showing 1,505 changed files with 150,539 additions and 4,809 deletions.
2 changes: 2 additions & 0 deletions .hgignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,3 +96,5 @@ test/testwm2
test/torturethread
test/*.exe
test/*.dSYM
buildbot
test/buildbot
2 changes: 2 additions & 0 deletions .hgtags
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,5 @@ a8bd63b33636715f2cf6e7d36ab7201acbd478fe release-2.0.1
9ec71e56071cc80eda6691a3f8719ed5395dfcfb release-2.0.1
9ec71e56071cc80eda6691a3f8719ed5395dfcfb release-2.0.1
0000000000000000000000000000000000000000 release-2.0.1
0000000000000000000000000000000000000000 release-2.0.1
b9663c77f5c95ebf05f3c18e80619caae8ae1460 release-2.0.1
1 change: 1 addition & 0 deletions Android.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ LOCAL_SRC_FILES := \
$(LOCAL_PATH)/src/atomic/SDL_spinlock.c.arm \
$(wildcard $(LOCAL_PATH)/src/core/android/*.c) \
$(wildcard $(LOCAL_PATH)/src/cpuinfo/*.c) \
$(wildcard $(LOCAL_PATH)/src/dynapi/*.c) \
$(wildcard $(LOCAL_PATH)/src/events/*.c) \
$(wildcard $(LOCAL_PATH)/src/file/*.c) \
$(wildcard $(LOCAL_PATH)/src/haptic/*.c) \
Expand Down
Loading

0 comments on commit 70a047d

Please sign in to comment.