Changeset 2858


Ignore:
Timestamp:
Aug 19, 2013 10:13:39 AM (6 years ago)
Author:
tkr
Message:

Merging r 2857 from trunk

Location:
stable/0.7
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • stable/0.7

    • Property svn:mergeinfo changed
      /trunkmerged: 2857
  • stable/0.7/MSVisualStudio/v10/Common.props

    r2619 r2858  
    1 <?xml version="1.0" encoding="utf-8"?>
     1<?xml version="1.0" encoding="utf-8"?>
    22<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
    33  <ImportGroup Label="PropertySheets" />
     
    1212      <RuntimeTypeInfo>true</RuntimeTypeInfo>
    1313    </ClCompile>
     14    <Link>
     15      <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     16    </Link>
    1417  </ItemDefinitionGroup>
    1518  <ItemGroup />
  • stable/0.7/compile_f2c

    • Property svn:mergeinfo changed (with no actual effect on merging)
Note: See TracChangeset for help on using the changeset viewer.