diff options
| author | Fate <fate-tmw@googlemail.com> | 2008-12-01 13:00:13 -0700 |
|---|---|---|
| committer | Fate <fate-tmw@googlemail.com> | 2008-12-01 13:00:13 -0700 |
| commit | f694a2b3d37c562d88dfed245f266859d00e1f08 (patch) | |
| tree | ab303c35b3fd70dffb15ef26c661abb0b98714e9 /conf | |
| parent | 98860f7aa06060e6c6b59efeb3414b3bec67695a (diff) | |
| parent | f0b260b403e3f386fb5d3b425535cd7d8248f494 (diff) | |
| download | serverdata-f694a2b3d37c562d88dfed245f266859d00e1f08.tar.gz serverdata-f694a2b3d37c562d88dfed245f266859d00e1f08.tar.bz2 serverdata-f694a2b3d37c562d88dfed245f266859d00e1f08.tar.xz serverdata-f694a2b3d37c562d88dfed245f266859d00e1f08.zip | |
Merge branch 'master' of git@gitorious.org:tmw-eathena-data/mainline into magic
Conflicts:
db/item_db.txt
Diffstat (limited to 'conf')
0 files changed, 0 insertions, 0 deletions