Fixed merge

This commit is contained in:
Christophe Riccio
2014-12-09 10:57:21 +01:00
8 changed files with 244 additions and 105 deletions

View File

@@ -70,6 +70,9 @@ Fixes:
- Fixed C++11 explicit conversion operators detection #282
- Fixed missing explicit convertion when using integer log2 with *vec1 types
- Fixed 64 bits integer GTX_string_cast to_string on VC 32 bit compiler
- Fixed Android build issue, STL C++11 is not supported by the NDK #284
- Fixed unsupported _BitScanForward64 and _BitScanReverse64 in VC10
- Fixed Visual C++ 32 bit build #283
================================================================================
GLM 0.9.6.0: 2014-11-30