summaryrefslogtreecommitdiffstats
path: root/crawl-ref/settings
diff options
context:
space:
mode:
authordolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2009-07-26 13:33:54 +0000
committerdolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2009-07-26 13:33:54 +0000
commit3dd428f3f253cc01f67f346d17fc6c5cb876d3d4 (patch)
tree4eea61d691f47dfd789df3c3190aa6f9488a1ea0 /crawl-ref/settings
parentcf8b9522f2eb8cb8dcd044816b3f04bf83387f78 (diff)
downloadcrawl-ref-3dd428f3f253cc01f67f346d17fc6c5cb876d3d4.tar.gz
crawl-ref-3dd428f3f253cc01f67f346d17fc6c5cb876d3d4.zip
Forward-port some applicable parts of 0.5 r10419 to trunk.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10420 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/settings')
-rw-r--r--crawl-ref/settings/init.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/crawl-ref/settings/init.txt b/crawl-ref/settings/init.txt
index 4d5d853b7d..fb0ab3af93 100644
--- a/crawl-ref/settings/init.txt
+++ b/crawl-ref/settings/init.txt
@@ -108,7 +108,7 @@ drop_filter = useless_item
# drop_mode = (multi | single)
# pickup_mode = (single | multi | auto:5)
# drop_filter = skeleton, rotting, corpse
-# default_friendly_pickup = (none | friend | all)
+# default_friendly_pickup = (none | friend | player | all)
##### 4-b Targetting ############################
#