diff options
| author | Adam Borowski <kilobyte@angband.pl> | 2012-11-04 17:18:19 +0100 |
|---|---|---|
| committer | Adam Borowski <kilobyte@angband.pl> | 2012-11-04 17:18:19 +0100 |
| commit | 2d0488338ac2a0388167c9e8b73766ae8af1e8d4 (patch) | |
| tree | c92aa786daa5e2f0782de9234d70fcb0fdfaf700 /crawl-ref/source/arena.h | |
| parent | 177cfa8d1158dd7c2ed8c995cf1ee706f1492f80 (diff) | |
| parent | 59910180e554e796fe4a8b1f095f88dccbe0ac89 (diff) | |
| download | crawl-ref-2d0488338ac2a0388167c9e8b73766ae8af1e8d4.tar.gz crawl-ref-2d0488338ac2a0388167c9e8b73766ae8af1e8d4.zip | |
Merge branch 'master' into mon-pick
Merge commits instead of rerere suck, but not being able to comfortably use
the test rig sucks even more.
Diffstat (limited to 'crawl-ref/source/arena.h')
| -rw-r--r-- | crawl-ref/source/arena.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crawl-ref/source/arena.h b/crawl-ref/source/arena.h index b652ef8f8f..8f713a6cb9 100644 --- a/crawl-ref/source/arena.h +++ b/crawl-ref/source/arena.h @@ -14,7 +14,7 @@ struct mgen_data; struct coord_def; -NORETURN void run_arena(const std::string& teams); +NORETURN void run_arena(const string& teams); monster_type arena_pick_random_monster(const level_id &place); |