Merge pull request #3335 from ilya-lavrenov:neon_ios
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Wed, 15 Oct 2014 10:29:53 +0000 (10:29 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Wed, 15 Oct 2014 10:29:54 +0000 (10:29 +0000)
1  2 
CMakeLists.txt

diff --cc CMakeLists.txt
Simple merge