Hash : 64e1b1ca Author : Date : 2013-10-14T09:14:09
Fixed project conflict during commit
Fork of https://github.com/libsdl-org/SDL