diff options
| author | Jared Adams <jaxad0127@gmail.com> | 2009-02-18 19:57:35 +0000 |
|---|---|---|
| committer | Jared Adams <jaxad0127@gmail.com> | 2009-02-18 19:57:35 +0000 |
| commit | 7464175373616085130e0d2e3b9ddc8e0322f291 (patch) | |
| tree | 039d01f52f6b76af2d1c7526b1673d646ddf532c /npc/018-2_Woodland_mining_camp | |
| parent | 60e20acf62941b81bd560c87a2cf161e16ea2277 (diff) | |
| parent | 291215cde58a739d13a5bfd519489b736d8302dc (diff) | |
| download | serverdata-7464175373616085130e0d2e3b9ddc8e0322f291.tar.gz serverdata-7464175373616085130e0d2e3b9ddc8e0322f291.tar.bz2 serverdata-7464175373616085130e0d2e3b9ddc8e0322f291.tar.xz serverdata-7464175373616085130e0d2e3b9ddc8e0322f291.zip | |
Merge commit 'mainline/master'
Conflicts:
npc/001-1_Tulimshar/elanore.txt
npc/013-3_Cave/barrier.txt
npc/015-3/katze.txt
Diffstat (limited to 'npc/018-2_Woodland_mining_camp')
| -rw-r--r-- | npc/018-2_Woodland_mining_camp/caul.txt | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/npc/018-2_Woodland_mining_camp/caul.txt b/npc/018-2_Woodland_mining_camp/caul.txt index ff20e69f..f03aeff5 100644 --- a/npc/018-2_Woodland_mining_camp/caul.txt +++ b/npc/018-2_Woodland_mining_camp/caul.txt @@ -464,5 +464,3 @@ L_NohMask: mes "\"I'm sorry, but I didn't. I'm staying in town. Try asking one of the miners.\""; close; } - - |