Merge pull request #1604 from bmiklautz/build_fixes
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Fri, 22 Nov 2013 14:22:43 +0000 (06:22 -0800)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Fri, 22 Nov 2013 14:22:43 +0000 (06:22 -0800)
commit2130a5f893fae00b9c44ac9eb197fce31a91f772
treed17b6456efdecc524ff4cd6b16505e59932b51be
parent63ff9255fd142e0bb6998e3de8628e68e7765a63
parentc065b0a72f52ea0ee12e4057a0bbad57bb2aed20
Merge pull request #1604 from bmiklautz/build_fixes

Build fixes for android and windows