Small snafu while merging

git-svn-id: svn://svn.icculus.org/fs2open@10066 387891d4-d844-0410-90c0-e4c51a9137d3
Updated project files for VS2012

git-svn-id: svn://svn.icculus.org/fs2open@10067 387891d4-d844-0410-90c0-e4c51a9137d3