Finished basic player sprite

author drumsetmonkey <abelleisle@roadrunner.com>

Thu, 21 Jan 2016 14:24:53 +0000 (09:24 -0500)

committer drumsetmonkey <abelleisle@roadrunner.com>

Thu, 21 Jan 2016 14:24:53 +0000 (09:24 -0500)
author drumsetmonkey <abelleisle@roadrunner.com>
Thu, 21 Jan 2016 14:24:53 +0000 (09:24 -0500)
committer drumsetmonkey <abelleisle@roadrunner.com>
Thu, 21 Jan 2016 14:24:53 +0000 (09:24 -0500)
diff --cc include/entities.h
Simple merge
diff --cc src/entities.cpp
Simple merge
author	drumsetmonkey <abelleisle@roadrunner.com>
	Thu, 21 Jan 2016 14:24:53 +0000 (09:24 -0500)
committer	drumsetmonkey <abelleisle@roadrunner.com>
	Thu, 21 Jan 2016 14:24:53 +0000 (09:24 -0500)
		1	2
include/entities.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/entities.cpp	patch \|	diff1 \|	diff2 \|	blob \| history