Fixed project conflict during commit

Browse Source

...

This commit is contained in:

Sam Lantinga 2013-10-14 09:14:09 -07:00

parent 4b603abfd7

commit 64e1b1ca36

1 changed files with 678 additions and 465 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1143

VisualC/SDL/SDL_VS2010.vcxproj

File diff suppressed because it is too large Load Diff