Commit 64e1b1ca36ad4dabba7607904275bda9a7cde25f

Sam Lantinga 2013-10-14T09:14:09

Fixed project conflict during commit