Commit 9fa4da1353c98fe4b8b9efcd3e360591dcc0f7a4

Sam Lantinga 2013-11-28T02:31:32

Fixed windows build with conflict resolve