Eduardo Quezada 6b79c7772c Merge branch 'RHH/dev' into RHH/pr/pretmerge_20220909 ... # Conflicts: # src/battle_interface.c		2022-09-16 11:56:50 -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 branch 'RHH/dev' into RHH/pr/pretmerge_20220909	2022-09-16 11:56:50 -03:00
mapjson.h