Fixed project conflict during commit

Browse Source

...

This commit is contained in:

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

1 parent 4b603abfd7

commit 64e1b1ca36

1 file changed

+678 -465

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

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

VisualC/SDL/SDL_VS2010.vcxproj

+678 -465

File diff suppressed because it is too large. Load diff