Merge pull request #1377 from Azaezel/hash_map
commit6fe55b9f47d8fd3745e028c79d2b4b110a00ffbc
authorAreloch <areloch@gmail.com>
Wed, 26 Aug 2015 05:31:45 +0000 (26 00:31 -0500)
committerAreloch <areloch@gmail.com>
Wed, 26 Aug 2015 05:31:45 +0000 (26 00:31 -0500)
treeb259c260b7ce0f203ad8002e09a8ec58ef4118b8
parentac6bca6f131f842ef8823c36f41e96dd53a5eaca
parenta487583946bfa391e5175514356d8613e9d57256
Merge pull request #1377 from Azaezel/hash_map

From Dušan Jocić: convexDecomp vs2015+ compatibility patch