Eduardo Quezada 7774c9727d Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pret_20230125 ... # Conflicts: # tools/mapjson/mapjson.cpp		2023-01-25 20:28:55 -03:00
..
.gitignore	Cleanup and add game version flag to mapjson tool	2019-02-04 17:28:45 -06:00
json11.cpp
json11.h
Makefile	[Round 3] Apply all source related changes for the new INSTALL.md in one commit.	2020-12-16 21:24:44 -05:00
mapjson.cpp	Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pret_20230125	2023-01-25 20:28:55 -03:00
mapjson.h