Merge branch 'master' into dev

This commit is contained in:
bao-qian
2015-11-28 11:48:28 +00:00
42 changed files with 121 additions and 555 deletions

View File

@@ -100,6 +100,9 @@
<Reference Include="PresentationFramework" />
</ItemGroup>
<ItemGroup>
<Compile Include="..\SolutionAssemblyInfo.cs">
<Link>Properties\SolutionAssemblyInfo.cs</Link>
</Compile>
<Compile Include="CommandArgs\ToggleCommandArg.cs" />
<Compile Include="Converters\ConvertorBase.cs" />
<Compile Include="Converters\ImagePathConverter.cs" />