f29d13b4e8
Conflicts: data/mp/stats/weapons.txt src/Makefile.am src/ai.h |
||
---|---|---|
.. | ||
body.ini | ||
bodypropulsionimd.ini | ||
brain.ini | ||
construction.ini | ||
ecm.ini | ||
features.ini | ||
propulsion.ini | ||
propulsionsounds.ini | ||
propulsiontype.ini | ||
repair.ini | ||
research.ini | ||
sensor.ini | ||
structure.ini | ||
structuremodifier.ini | ||
templates.ini | ||
terraintable.ini | ||
weaponmodifier.ini | ||
weapons.ini |