Merge pull request #867 from mfleisz/master
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Thu, 20 Dec 2012 16:02:24 +0000 (08:02 -0800)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Thu, 20 Dec 2012 16:02:24 +0000 (08:02 -0800)
cmake: fixed errors with Android build


Trivial merge