Merge branch 'master' into ench-split
authorAdam Borowski <kilobyte@angband.pl>
Wed, 5 Jan 2011 12:10:51 +0000 (13:10 +0100)
committerAdam Borowski <kilobyte@angband.pl>
Wed, 5 Jan 2011 12:10:51 +0000 (13:10 +0100)
commit90ec54410b65d43855db7a68348ede3908979558
tree9cf053445bb26b6f06422eb2290a140546812d1e
parent11214880ea8006145d52dc12ab3cb3511d033835
parentfd18e77ace0f15f861fa5a74c583966cccfd2ac6
Merge branch 'master' into ench-split
19 files changed:
crawl-ref/docs/template/apt-tmpl.txt
crawl-ref/source/abl-show.cc
crawl-ref/source/acquire.cc
crawl-ref/source/aptitudes.h
crawl-ref/source/chardump.cc
crawl-ref/source/effects.cc
crawl-ref/source/enum.h
crawl-ref/source/main.cc
crawl-ref/source/ng-setup.cc
crawl-ref/source/player.cc
crawl-ref/source/skills2.cc
crawl-ref/source/skills2.h
crawl-ref/source/spl-cast.cc
crawl-ref/source/spl-data.h
crawl-ref/source/spl-miscast.cc
crawl-ref/source/spl-util.cc
crawl-ref/source/spl-util.h
crawl-ref/source/tag-version.h
crawl-ref/source/tags.cc