diff options
| author | DracoOmega <draco_omega@live.com> | 2014-02-13 22:01:47 -0330 |
|---|---|---|
| committer | DracoOmega <draco_omega@live.com> | 2014-02-13 22:01:47 -0330 |
| commit | 8b692751aca0bde2d58bdba056c6b94661c3011b (patch) | |
| tree | d1bc81cf4af2cd5462fc563525b7d9da8a620e87 /crawl-ref/source/terrain.cc | |
| parent | 230ef3e62244bdff6adcb585676b0469e80f8b10 (diff) | |
| parent | b78098f4675f43661c4eadc0437d3c15462a63e2 (diff) | |
| download | crawl-ref-8b692751aca0bde2d58bdba056c6b94661c3011b.tar.gz crawl-ref-8b692751aca0bde2d58bdba056c6b94661c3011b.zip | |
Merge branch 'master' into summon_spells
Conflicts:
crawl-ref/source/enum.h
crawl-ref/source/spl-data.h
crawl-ref/source/spl-summoning.cc
Diffstat (limited to 'crawl-ref/source/terrain.cc')
| -rw-r--r-- | crawl-ref/source/terrain.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crawl-ref/source/terrain.cc b/crawl-ref/source/terrain.cc index bd54df794a..45685741db 100644 --- a/crawl-ref/source/terrain.cc +++ b/crawl-ref/source/terrain.cc @@ -1629,7 +1629,7 @@ static const char *dngn_feature_names[] = "altar_okawaru", "altar_makhleb", "altar_sif_muna", "altar_trog", "altar_nemelex_xobeh", "altar_elyvilon", "altar_lugonu", "altar_beogh", "altar_jiyva", "altar_fedhas", "altar_cheibriados", -"altar_ashenzari", "altar_dithmengos", +"altar_ashenzari", "altar_dithmenos", "fountain_blue", "fountain_sparkling", "fountain_blood", #if TAG_MAJOR_VERSION == 34 |