diff options
| author | Robert Burnham <burnhamrobertp@gmail.com> | 2011-04-26 08:47:05 -0500 |
|---|---|---|
| committer | Robert Burnham <burnhamrobertp@gmail.com> | 2011-04-26 08:47:05 -0500 |
| commit | 809ea63fb87708fcb763492e2da99188679ed0f4 (patch) | |
| tree | de25799e8538d30d4eb5dcfa37a7bc328ea491c3 /crawl-ref/source/dbg-util.cc | |
| parent | 77b621a0ace27951fc2f24ab357f69430bcbfd67 (diff) | |
| parent | 96f00b85b9271dade59c577353651eca1e88e0cd (diff) | |
| download | crawl-ref-809ea63fb87708fcb763492e2da99188679ed0f4.tar.gz crawl-ref-809ea63fb87708fcb763492e2da99188679ed0f4.zip | |
Merge branch 'master' into unified_combat_control
Conflicts:
crawl-ref/source/actor.cc
crawl-ref/source/delay.cc
crawl-ref/source/directn.cc
crawl-ref/source/directn.h
crawl-ref/source/fight.cc
crawl-ref/source/files.cc
crawl-ref/source/mon-act.cc
crawl-ref/source/monster.cc
crawl-ref/source/mpr.h
crawl-ref/source/player.cc
crawl-ref/source/shopping.cc
Diffstat (limited to 'crawl-ref/source/dbg-util.cc')
| -rw-r--r-- | crawl-ref/source/dbg-util.cc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/crawl-ref/source/dbg-util.cc b/crawl-ref/source/dbg-util.cc index 5b05ad50c2..e40f90e1b5 100644 --- a/crawl-ref/source/dbg-util.cc +++ b/crawl-ref/source/dbg-util.cc @@ -1,8 +1,7 @@ -/* - * File: dbg-util.cc - * Summary: Miscellaneous debugging functions. - * Written by: Linley Henzell and Jesse Jones - */ +/** + * @file + * @brief Miscellaneous debugging functions. +**/ #include "AppHdr.h" |