Merge pull request #1025 from mfoster96/develop
authorZhang Xianyi <traits.zhang@gmail.com>
Sun, 18 Dec 2016 06:47:59 +0000 (14:47 +0800)
committerGitHub <noreply@github.com>
Sun, 18 Dec 2016 06:47:59 +0000 (14:47 +0800)
Fix for issue #1024: arm-linux-androideabi-g++ Compiler Error in /cpu…


Trivial merge