mikymod 58c31071fb Merge branch 'master' into resource-manager %!s(int64=11) %!d(string=hai) anos
..
compressors f898df9cb0 Fix warnings in ZipCompressor %!s(int64=12) %!d(string=hai) anos
containers 121647e374 Fix sort_map::set to overwrite value when existing key is found %!s(int64=11) %!d(string=hai) anos
filesystem 041cef3bab Add read/write data blocks %!s(int64=11) %!d(string=hai) anos
json d479ce6137 Use 64 bit murmur to hash resource type/name %!s(int64=11) %!d(string=hai) anos
math dde3ec9d66 Port Color4 to NMF %!s(int64=11) %!d(string=hai) anos
mem 4fa9c557f4 Mimic free()/delete behavior %!s(int64=11) %!d(string=hai) anos
settings 11844a738f Moved all windows specific #define/#undef to WinHeaders.h %!s(int64=12) %!d(string=hai) anos
strings d479ce6137 Use 64 bit murmur to hash resource type/name %!s(int64=11) %!d(string=hai) anos
Args.h 75baf9df20 Move Args implementation to Args.h %!s(int64=11) %!d(string=hai) anos
Assert.h 832542c234 Remove development and release #defines %!s(int64=11) %!d(string=hai) anos
Error.h 69a4a68530 Fix CROWN_PLATFORM_* checks %!s(int64=11) %!d(string=hai) anos
Functional.h 11c147379f Add SortMap %!s(int64=11) %!d(string=hai) anos
Log.h 832542c234 Remove development and release #defines %!s(int64=11) %!d(string=hai) anos
Macros.h 9bb1cffc4c Use CE_UNUSED to signal unused variables %!s(int64=11) %!d(string=hai) anos
Profiler.h a5fd5b6345 Log directly to ConsoleServer %!s(int64=11) %!d(string=hai) anos
Types.h 69a4a68530 Fix CROWN_PLATFORM_* checks %!s(int64=11) %!d(string=hai) anos