Merge branch 'panlord-colour'
authorSteve Melenchuk <smelenchuk@gmail.com>
Sun, 30 Nov 2014 05:56:06 +0000 (22:56 -0700)
committerSteve Melenchuk <smelenchuk@gmail.com>
Sun, 30 Nov 2014 05:56:06 +0000 (22:56 -0700)
commitd8753279569d548a333fad3e688186eef46d505a
tree9c447ef9e982f7fa60c08151c627398c38f9276b
parent1f3fc7e4b97ea26698de6e759e3b6a17c4a3b193
parentf7891978d160e28ee34de5d59e67f46aa6ee7bd7
Merge branch 'panlord-colour'
crawl-ref/source/describe.cc
crawl-ref/source/tilemcache.cc