Eduardo Quezada e4a439aa46 Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretmerge_20221030 ... # Conflicts: # src/data/bard_music/moves.h # src/data/bard_music/pokemon.h		2022-10-30 12:30:38 -03:00
..
.gitignore	Cleanup and add game version flag to mapjson tool	2019-02-04 17:28:45 -06:00
json11.cpp	convert mapjson.py to mapjson.cpp	2019-02-03 09:38:29 -06:00
json11.h	convert mapjson.py to mapjson.cpp	2019-02-03 09:38:29 -06:00
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/pretmerge_20221030	2022-10-30 12:30:38 -03:00
mapjson.h	convert mapjson.py to mapjson.cpp	2019-02-03 09:38:29 -06:00