Merge pull request #566 from powderluv/develop
authorZhang Xianyi <traits.zhang@gmail.com>
Tue, 12 May 2015 01:59:12 +0000 (20:59 -0500)
committerZhang Xianyi <traits.zhang@gmail.com>
Tue, 12 May 2015 01:59:12 +0000 (20:59 -0500)
commit5f9011d6ef401727c048e5e84fd9ace8cabb0cca
treebfde0c3164587d59b6462b6309adbcabc1599a8d
parent8e5a1083bbfca6d93e3d35c1490311cbda675761
parentebb9eba9875d68ec7efe3f9e362f0a65384a8277
Merge pull request #566 from powderluv/develop

Fix build with ALLOC_SHM=0 (Android NDK)