diff options
| author | Robert Burnham <burnhamrobertp@gmail.com> | 2011-11-16 11:29:27 -0600 |
|---|---|---|
| committer | Robert Burnham <burnhamrobertp@gmail.com> | 2011-11-16 11:29:27 -0600 |
| commit | 06f3895bacfc80c69dd1c3bbfa2d1857ecde165b (patch) | |
| tree | ea9c59532861b584dec95554aaaad310b1f31833 /crawl-ref/source/mpr.h | |
| parent | e1dcbbafa2eb2c7bb835d65077ecc4f0766ff427 (diff) | |
| parent | 833bd72fba5a1c683a2391462986193e40d4d313 (diff) | |
| download | crawl-ref-06f3895bacfc80c69dd1c3bbfa2d1857ecde165b.tar.gz crawl-ref-06f3895bacfc80c69dd1c3bbfa2d1857ecde165b.zip | |
Merge branch 'master' into unified_combat_control
Conflicts:
crawl-ref/source/fight.cc
crawl-ref/source/food.cc
crawl-ref/source/libutil.cc
crawl-ref/source/melee_attack.h
crawl-ref/source/mon-stuff.cc
crawl-ref/source/spl-damage.cc
Diffstat (limited to 'crawl-ref/source/mpr.h')
| -rw-r--r-- | crawl-ref/source/mpr.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/crawl-ref/source/mpr.h b/crawl-ref/source/mpr.h index 86a044f1bc..9ab21d24e0 100644 --- a/crawl-ref/source/mpr.h +++ b/crawl-ref/source/mpr.h @@ -43,7 +43,6 @@ enum msg_channel_type MSGCH_ERROR, // error messages MSGCH_TUTORIAL, // messages for tutorial MSGCH_ORB, // messages for the orb - MSGCH_WIZARD, // wizard-mode and technical messages NUM_MESSAGE_CHANNELS // always last }; |