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)
commitfa78439359d33121f86eff64ed3f33fc8c9516d6
treed7a49b9cca6b02b25da374e6a26246f5c07cfa47
parent261f493b044f5cdafffbad34deb7e32bab96ab76
parent15d5037df438e60f2c5439184dbe7ea232cbd100
Merge pull request #2343 from kilobyte/master

Fix build failure on x32.
CMakeLists.txt