diff options
author | Jared Adams <jaxad0127@gmail.com> | 2009-03-08 18:57:16 -0600 |
---|---|---|
committer | Jared Adams <jaxad0127@gmail.com> | 2009-03-08 18:57:16 -0600 |
commit | e5ac95f237d5c96c39e3b5573d198138f855e30d (patch) | |
tree | 09f6b19c3b119d563e3207c2901ce2cc506ee1bb /data/resnametable.txt | |
parent | 2a73e3544d6ac4d4f000c621753d70e8695e203c (diff) | |
parent | b073a508fb4c61ed3cb4f4cc62fc3d892480a6b8 (diff) | |
download | serverdata-e5ac95f237d5c96c39e3b5573d198138f855e30d.tar.gz serverdata-e5ac95f237d5c96c39e3b5573d198138f855e30d.tar.bz2 serverdata-e5ac95f237d5c96c39e3b5573d198138f855e30d.tar.xz serverdata-e5ac95f237d5c96c39e3b5573d198138f855e30d.zip |
Merge commit 'mainline/master'
Conflicts:
data/021-2.wlk
data/023-1.wlk
Diffstat (limited to 'data/resnametable.txt')
-rw-r--r-- | data/resnametable.txt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/data/resnametable.txt b/data/resnametable.txt index 02c33d6d..e74aac31 100644 --- a/data/resnametable.txt +++ b/data/resnametable.txt @@ -43,4 +43,9 @@ 020-4.gat#020-4.wlk# 021-1.gat#021-1.wlk# 021-2.gat#021-2.wlk# +021-8.gat#021-8.wlk# 022-1.gat#022-1.wlk# +023-1.gat#023-1.wlk# +024-1.gat#024-1.wlk# +024-2.gat#024-2.wlk# +botcheck.gat#botcheck.wlk# |