Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
Chris Cameron
2017-07-11 15:38:33 -04:00
3 changed files with 282 additions and 0 deletions

View File

@@ -36,6 +36,7 @@
</ItemGroup>
<ItemGroup>
<None Remove="ICD.Common.projectinfo" />
<None Remove="ICD.Common_SimplSharp.suo" />
<None Remove="ICD.SimplSharp.projectinfo" />
</ItemGroup>