Merge branch 'master' into portal_branches portal_branches
authorAdam Borowski <kilobyte@angband.pl>
Wed, 25 Apr 2012 14:35:56 +0000 (16:35 +0200)
committerAdam Borowski <kilobyte@angband.pl>
Wed, 25 Apr 2012 14:35:56 +0000 (16:35 +0200)
commite8da5e6c01950dd649f90030a2c77654480e4369
treeb8749886499f49f092be6362fe1e42bbabd53bfd
parentb15ddc7bf0397d5034f0514c2d76e717da0819ba
parentfb959798448db7e13e6485f7fece472404f21f0e
Merge branch 'master' into portal_branches
73 files changed:
crawl-ref/source/abl-show.cc
crawl-ref/source/abyss.cc
crawl-ref/source/arena.cc
crawl-ref/source/artefact.cc
crawl-ref/source/beam.cc
crawl-ref/source/cluautil.h
crawl-ref/source/command.cc
crawl-ref/source/dat/des/altar/overflow.des
crawl-ref/source/dat/des/builder/shops.des
crawl-ref/source/dat/des/portals/bailey.des
crawl-ref/source/dat/des/portals/wizlab.des
crawl-ref/source/dat/des/variable/evilmike_ambush.des
crawl-ref/source/dat/des/variable/mini_features.des
crawl-ref/source/dat/des/variable/mini_monsters.des
crawl-ref/source/dbg-asrt.cc
crawl-ref/source/decks.cc
crawl-ref/source/decks.h
crawl-ref/source/defines.h
crawl-ref/source/dgn-shoals.cc
crawl-ref/source/directn.cc
crawl-ref/source/dungeon.cc
crawl-ref/source/effects.cc
crawl-ref/source/enum.h
crawl-ref/source/files.cc
crawl-ref/source/food.cc
crawl-ref/source/godpassive.cc
crawl-ref/source/hiscores.cc
crawl-ref/source/hiscores.h
crawl-ref/source/items.cc
crawl-ref/source/l_dgn.cc
crawl-ref/source/l_dgnbld.cc
crawl-ref/source/l_item.cc
crawl-ref/source/l_you.cc
crawl-ref/source/main.cc
crawl-ref/source/makeitem.cc
crawl-ref/source/mapdef.cc
crawl-ref/source/mapdef.h
crawl-ref/source/maps.cc
crawl-ref/source/melee_attack.cc
crawl-ref/source/misc.cc
crawl-ref/source/mon-abil.cc
crawl-ref/source/mon-act.cc
crawl-ref/source/mon-cast.cc
crawl-ref/source/mon-movetarget.cc
crawl-ref/source/mon-pick.cc
crawl-ref/source/mon-place.cc
crawl-ref/source/mon-stuff.cc
crawl-ref/source/mon-util.cc
crawl-ref/source/monster.cc
crawl-ref/source/ng-init.cc
crawl-ref/source/ng-setup.cc
crawl-ref/source/output.cc
crawl-ref/source/player.cc
crawl-ref/source/player.h
crawl-ref/source/religion.cc
crawl-ref/source/rltiles/dc-item.txt
crawl-ref/source/shopping.cc
crawl-ref/source/spl-miscast.cc
crawl-ref/source/spl-transloc.cc
crawl-ref/source/startup.cc
crawl-ref/source/stash.cc
crawl-ref/source/tags.cc
crawl-ref/source/terrain.cc
crawl-ref/source/terrain.h
crawl-ref/source/tilepick.cc
crawl-ref/source/tileview.cc
crawl-ref/source/traps.cc
crawl-ref/source/traps.h
crawl-ref/source/view.cc
crawl-ref/source/viewmap.cc
crawl-ref/source/wiz-dgn.cc
crawl-ref/source/wiz-mon.cc
crawl-ref/source/xom.cc