Merge branch 'master' of http://github.com/tcsullivan/gamedev

author drumsetmonkey <abelleisle@roadrunner.com>

Tue, 1 Mar 2016 13:43:33 +0000 (08:43 -0500)

committer drumsetmonkey <abelleisle@roadrunner.com>

Tue, 1 Mar 2016 13:43:33 +0000 (08:43 -0500)
author drumsetmonkey <abelleisle@roadrunner.com>
Tue, 1 Mar 2016 13:43:33 +0000 (08:43 -0500)
committer drumsetmonkey <abelleisle@roadrunner.com>
Tue, 1 Mar 2016 13:43:33 +0000 (08:43 -0500)
diff --cc src/entities.cpp
Simple merge
diff --cc src/inventory.cpp
Simple merge
diff --cc src/ui.cpp
Simple merge
author	drumsetmonkey <abelleisle@roadrunner.com>
	Tue, 1 Mar 2016 13:43:33 +0000 (08:43 -0500)
committer	drumsetmonkey <abelleisle@roadrunner.com>
	Tue, 1 Mar 2016 13:43:33 +0000 (08:43 -0500)
		1	2
src/entities.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
src/inventory.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
src/ui.cpp	patch \|	diff1 \|	diff2 \|	blob \| history