Fixed merge conflicts

Browse source

...

This commit is contained in:

Dimitris Panokostas 2019-02-14 21:58:47 +01:00

parent 537781e6d3

commit 38cfb80472

2 changed files with 2520 additions and 24 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2517

whdboot/game-data/whdload_db.xml

View file

File diff suppressed because it is too large Load diff