Merge pull request #2343 from kilobyte/master
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Wed, 4 Feb 2015 16:32:12 +0000 (11:32 -0500)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Wed, 4 Feb 2015 16:32:12 +0000 (11:32 -0500)
Fix build failure on x32.

1  2 
CMakeLists.txt

diff --cc CMakeLists.txt
Simple merge