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

author drumsetmonkey <abelleisle@roadrunner.com>

Tue, 1 Dec 2015 12:29:47 +0000 (07:29 -0500)

committer drumsetmonkey <abelleisle@roadrunner.com>

Tue, 1 Dec 2015 12:29:47 +0000 (07:29 -0500)
author drumsetmonkey <abelleisle@roadrunner.com>
Tue, 1 Dec 2015 12:29:47 +0000 (07:29 -0500)
committer drumsetmonkey <abelleisle@roadrunner.com>
Tue, 1 Dec 2015 12:29:47 +0000 (07:29 -0500)
diff --cc include/inventory.h
Simple merge
diff --cc src/entities.cpp
Simple merge
diff --cc src/inventory.cpp
Simple merge
author	drumsetmonkey <abelleisle@roadrunner.com>
	Tue, 1 Dec 2015 12:29:47 +0000 (07:29 -0500)
committer	drumsetmonkey <abelleisle@roadrunner.com>
	Tue, 1 Dec 2015 12:29:47 +0000 (07:29 -0500)
		1	2
include/inventory.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/entities.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
src/inventory.cpp	patch \|	diff1 \|	diff2 \|	blob \| history