From: Matt Mullins <mokomull@gmail.com>
Date: Sun, 12 Jul 2009 21:42:50 +0000 (-0500)
Subject: Merge branch 'master' of koopa.local:~ivan/Desktop/Game
X-Git-Url: http://git.mmlx.us/?a=commitdiff_plain;h=d41e382ae8be9a2844d4f464ac7ebf8148fdefb5;p=IvanGame.git

Merge branch 'master' of koopa.local:~ivan/Desktop/Game

Conflicts:
	Sprite.h
---

d41e382ae8be9a2844d4f464ac7ebf8148fdefb5