Merge branch 'skillmenu'
authorShmuale Mark <shm.mark@gmail.com>
Wed, 15 Apr 2015 14:18:49 +0000 (10:18 -0400)
committerShmuale Mark <shm.mark@gmail.com>
Wed, 15 Apr 2015 14:18:49 +0000 (10:18 -0400)
Conflicts:
crawl-ref/source/skill_menu.cc

1  2 
crawl-ref/source/dat/database/help.txt
crawl-ref/source/hints.cc
crawl-ref/source/player.cc

Simple merge
Simple merge