Merge branch 'panlord-colour'

author Steve Melenchuk <smelenchuk@gmail.com>

Sun, 30 Nov 2014 05:56:06 +0000 (22:56 -0700)

committer Steve Melenchuk <smelenchuk@gmail.com>

Sun, 30 Nov 2014 05:56:06 +0000 (22:56 -0700)
author Steve Melenchuk <smelenchuk@gmail.com>
Sun, 30 Nov 2014 05:56:06 +0000 (22:56 -0700)
committer Steve Melenchuk <smelenchuk@gmail.com>
Sun, 30 Nov 2014 05:56:06 +0000 (22:56 -0700)
diff --cc crawl-ref/source/describe.cc
Simple merge
diff --cc crawl-ref/source/tilemcache.cc
Simple merge
author	Steve Melenchuk <smelenchuk@gmail.com>
	Sun, 30 Nov 2014 05:56:06 +0000 (22:56 -0700)
committer	Steve Melenchuk <smelenchuk@gmail.com>
	Sun, 30 Nov 2014 05:56:06 +0000 (22:56 -0700)
		1	2
crawl-ref/source/describe.cc	patch \|	diff1 \|	diff2 \|	blob \| history
crawl-ref/source/tilemcache.cc	patch \|	diff1 \|	diff2 \|	blob \| history