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)
1  2 
crawl-ref/source/describe.cc
crawl-ref/source/tilemcache.cc

Simple merge
Simple merge