Merge branch 'master' into species_data
authorShmuale Mark <shm.mark@gmail.com>
Mon, 30 Mar 2015 14:04:36 +0000 (10:04 -0400)
committerShmuale Mark <shm.mark@gmail.com>
Mon, 30 Mar 2015 14:04:36 +0000 (10:04 -0400)
commite015a4a23e69ec13c3a29adb1e2f33c4663d2227
tree93d4c26857d8640f72be9df056b029083fa8dfe6
parent0a3e840ed3a92f462c9bde812ab082049359b9ca
parent006947c7c370490c7c91be79618de85a537dc2a4
Merge branch 'master' into species_data

uuuuuuuuuuuuuuuuugh

Conflicts:
crawl-ref/source/ability.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.cc
crawl-ref/source/species.cc
31 files changed:
crawl-ref/source/ability.cc
crawl-ref/source/art-func.h
crawl-ref/source/artefact.cc
crawl-ref/source/attack.cc
crawl-ref/source/command.cc
crawl-ref/source/describe.cc
crawl-ref/source/enum.h
crawl-ref/source/ghost.cc
crawl-ref/source/godabil.cc
crawl-ref/source/godwrath.cc
crawl-ref/source/item_use.cc
crawl-ref/source/main.cc
crawl-ref/source/melee_attack.cc
crawl-ref/source/mon-info.cc
crawl-ref/source/mon-util.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.cc
crawl-ref/source/player.h
crawl-ref/source/religion.cc
crawl-ref/source/skills.cc
crawl-ref/source/tags.cc
crawl-ref/source/transform.cc
crawl-ref/source/transform.h
crawl-ref/source/wiz-fsim.cc
crawl-ref/source/wiz-item.cc
crawl-ref/source/wiz-you.cc
crawl-ref/source/xom.cc