diff options
| author | Manoj Srivastava <srivasta@debian.org> | 2016-01-27 13:11:31 -0800 |
|---|---|---|
| committer | Manoj Srivastava <srivasta@debian.org> | 2016-01-27 13:11:31 -0800 |
| commit | 02819db3483514d49df7ec3f7e372b5aeb831466 (patch) | |
| tree | 6a86adac74beac293bc688dafcfa1709a6476901 /lib/mods/theme/edit/t_minas.txt | |
| parent | 2a61dffe127e22c1aaf955db6f085ac2eefbebba (diff) | |
| parent | 6f6de67c70fd98815088ce49f046f48f88ea35bd (diff) | |
Merge branch 'upstream'
Signed-off-by: Manoj Srivastava <srivasta@debian.org>
# Conflicts:
# src/CMakeLists.txt
# src/config.h
# src/lua/llimits.h
Diffstat (limited to 'lib/mods/theme/edit/t_minas.txt')
| -rw-r--r-- | lib/mods/theme/edit/t_minas.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/mods/theme/edit/t_minas.txt b/lib/mods/theme/edit/t_minas.txt index b96481d8..cea53634 100644 --- a/lib/mods/theme/edit/t_minas.txt +++ b/lib/mods/theme/edit/t_minas.txt @@ -15,7 +15,7 @@ F:w:8:3:0:0:0:0:0:24 # Quest 16 finished, reward is a between gate ?:[EQU $QUEST16 5] -F:Z:176:3:0:0:0:0:0:0 +F:Z:176:3:0:0:0:0:0:2 ?:1 |