Synced Marr with upstream

This commit is contained in:
Keivan Beigi 2013-05-02 11:14:54 -07:00
commit 16425cdab6
4 changed files with 113 additions and 79 deletions

View file

@ -12,10 +12,6 @@
<AssemblyName>Marr.Data</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<SccProjectName>SAK</SccProjectName>
<SccLocalPath>SAK</SccLocalPath>
<SccAuxPath>SAK</SccAuxPath>
<SccProvider>SAK</SccProvider>
<FileUpgradeFlags>
</FileUpgradeFlags>
<OldToolsVersion>3.5</OldToolsVersion>