Resolved merge conflict with develop.

Browse Source

...

This commit is contained in:

martin-osborne 2015-01-10 12:00:24 +00:00

parent b663902c68

commit 58e860c440

2 changed files with 0 additions and 3335 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

1452

Foundation/testsuite/TestSuite_vs71.vcproj

View File

File diff suppressed because it is too large Load Diff

1883

Foundation/testsuite/TestSuite_vs80.vcproj

View File

File diff suppressed because it is too large Load Diff