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 | |
| 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')
| -rw-r--r-- | data/008-1.wlk | bin | 18484 -> 18484 bytes | |||
| -rw-r--r-- | data/010-1.wlk | bin | 18004 -> 18004 bytes | |||
| -rw-r--r-- | data/018-1.wlk | bin | 24004 -> 24004 bytes | |||
| -rw-r--r-- | data/021-1.wlk | bin | 29908 -> 29908 bytes | |||
| -rw-r--r-- | data/021-2.wlk | bin | 11290 -> 40004 bytes | |||
| -rw-r--r-- | data/021-8.wlk | bin | 0 -> 11290 bytes | |||
| -rw-r--r-- | data/023-1.wlk | bin | 30004 -> 30004 bytes | |||
| -rw-r--r-- | data/024-1.wlk | bin | 0 -> 14522 bytes | |||
| -rw-r--r-- | data/024-2.wlk | bin | 0 -> 40004 bytes | |||
| -rw-r--r-- | data/resnametable.txt | 5 |
10 files changed, 5 insertions, 0 deletions
diff --git a/data/008-1.wlk b/data/008-1.wlk Binary files differindex a513fdc2..e051c2e1 100644 --- a/data/008-1.wlk +++ b/data/008-1.wlk diff --git a/data/010-1.wlk b/data/010-1.wlk Binary files differindex 33a7505f..8ae55525 100644 --- a/data/010-1.wlk +++ b/data/010-1.wlk diff --git a/data/018-1.wlk b/data/018-1.wlk Binary files differindex 38c24166..66649741 100644 --- a/data/018-1.wlk +++ b/data/018-1.wlk diff --git a/data/021-1.wlk b/data/021-1.wlk Binary files differindex 37ced2aa..51df0dfd 100644 --- a/data/021-1.wlk +++ b/data/021-1.wlk diff --git a/data/021-2.wlk b/data/021-2.wlk Binary files differindex 2f85d054..3fe682ff 100644 --- a/data/021-2.wlk +++ b/data/021-2.wlk diff --git a/data/021-8.wlk b/data/021-8.wlk Binary files differnew file mode 100644 index 00000000..8ddde1fd --- /dev/null +++ b/data/021-8.wlk diff --git a/data/023-1.wlk b/data/023-1.wlk Binary files differindex 1e728154..31f88b7b 100644 --- a/data/023-1.wlk +++ b/data/023-1.wlk diff --git a/data/024-1.wlk b/data/024-1.wlk Binary files differnew file mode 100644 index 00000000..0948e9a9 --- /dev/null +++ b/data/024-1.wlk diff --git a/data/024-2.wlk b/data/024-2.wlk Binary files differnew file mode 100644 index 00000000..74704a5f --- /dev/null +++ b/data/024-2.wlk 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# |