summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/travel.h
diff options
context:
space:
mode:
authorAdam Borowski <kilobyte@angband.pl>2011-12-28 02:43:54 +0100
committerAdam Borowski <kilobyte@angband.pl>2011-12-28 02:43:54 +0100
commit7b3785d07791141787a0eac6137cb5c98e1d210c (patch)
treeeee9a6aa9715f1569fddc102a15f578df2138902 /crawl-ref/source/travel.h
parent2cf8a18928f1c553efb5dffb1ab5b76b50731370 (diff)
parentefb6b1fd7b0c5027acd6d6ecede9bb34dfbea356 (diff)
downloadcrawl-ref-7b3785d07791141787a0eac6137cb5c98e1d210c.tar.gz
crawl-ref-7b3785d07791141787a0eac6137cb5c98e1d210c.zip
Merge branch 'master' into portal_branches
Diffstat (limited to 'crawl-ref/source/travel.h')
-rw-r--r--crawl-ref/source/travel.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/crawl-ref/source/travel.h b/crawl-ref/source/travel.h
index bc99c7e264..881a41d13c 100644
--- a/crawl-ref/source/travel.h
+++ b/crawl-ref/source/travel.h
@@ -271,7 +271,7 @@ private:
std::vector<std::string> marked_feats;
private:
- template <class C> void say_any(const C &coll, const char *stub) const;
+ template <class C> void say_any(const C &coll, const char *category) const;
template <class citer> bool has_duplicates(citer, citer) const;
std::string cleaned_feature_description(const coord_def &) const;