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)
commit7863fb55327f0152e5a0cb13ae2aa3b2a2ea46d1
treec256343058967d94b0a355da0bdb2dd947ede330
parentf3c920e20ba70865f9385349a4e0f7ed19dc9cf6
parent50cc3cd3efc48f68ec883fc4b3f62ec8c671a158
Merge branch 'skillmenu'

Conflicts:
crawl-ref/source/skill_menu.cc
crawl-ref/source/dat/database/help.txt
crawl-ref/source/hints.cc
crawl-ref/source/player.cc