Merge pull request #630 from buffer51/develop
authorZhang Xianyi <traits.zhang@gmail.com>
Fri, 4 Sep 2015 18:01:01 +0000 (13:01 -0500)
committerZhang Xianyi <traits.zhang@gmail.com>
Fri, 4 Sep 2015 18:01:01 +0000 (13:01 -0500)
commit40a3fed6b80523edc21449cee763bc5528a96cb2
tree8464040d2a31d962445cda8c17d235755adf06bc
parent5408074941d5cc0f4aad180562cafcf4cf27a56d
parent2297a2d9893667d3222139013de7398680ec6f1a
Merge pull request #630 from buffer51/develop

Fixed error in common.h for Android compilation introduced by e12cf11