Merge pull request #3384 from akallabeth/android64_build
authorNorbert Federa <nfedera@users.noreply.github.com>
Wed, 6 Jul 2016 11:58:10 +0000 (13:58 +0200)
committerGitHub <noreply@github.com>
Wed, 6 Jul 2016 11:58:10 +0000 (13:58 +0200)
Android64 build fixes

1  2 
CMakeLists.txt

diff --cc CMakeLists.txt
Simple merge