Merge branch 'master' into octopus, fix breakage.
authorAdam Borowski <kilobyte@angband.pl>
Thu, 3 Feb 2011 16:52:42 +0000 (17:52 +0100)
committerAdam Borowski <kilobyte@angband.pl>
Thu, 3 Feb 2011 16:52:42 +0000 (17:52 +0100)
commit6813b019f0066080f6561b3425e1c4f1553bcc25
treea055428736d638a91908e565f1de123813cec4e6
parentbc1c19ceb96baa4e4babe92848dcb17f765fcac5
parentb1d1c8eca886e034fe886174574a98fd9adb3b0d
Merge branch 'master' into octopus, fix breakage.
25 files changed:
crawl-ref/source/aptitudes.h
crawl-ref/source/command.cc
crawl-ref/source/describe.cc
crawl-ref/source/enum.h
crawl-ref/source/fight.cc
crawl-ref/source/godpassive.cc
crawl-ref/source/invent.cc
crawl-ref/source/item_use.cc
crawl-ref/source/itemname.cc
crawl-ref/source/items.cc
crawl-ref/source/l_item.cc
crawl-ref/source/misc.cc
crawl-ref/source/mutation-data.h
crawl-ref/source/mutation.cc
crawl-ref/source/ng-setup.cc
crawl-ref/source/output.cc
crawl-ref/source/player-act.cc
crawl-ref/source/player-equip.cc
crawl-ref/source/player.cc
crawl-ref/source/player.h
crawl-ref/source/skills2.cc
crawl-ref/source/species.cc
crawl-ref/source/spl-cast.cc
crawl-ref/source/wiz-item.cc
crawl-ref/source/xom.cc