Revert "Revert "Merge branch 'development' into release/v1.5.0""

This reverts commit 4cd01aa428.
This commit is contained in:
Andrew Welker
2020-05-06 12:33:32 -06:00
parent 4cd01aa428
commit bfa1fee522
12 changed files with 890 additions and 671 deletions

View File

@@ -100,6 +100,8 @@
<Compile Include="Chassis\DmpsInternalVirtualDmTxController.cs" />
<Compile Include="Chassis\DmpsRoutingController.cs" />
<Compile Include="Chassis\HdMdNxM4kEController.cs" />
<Compile Include="Endpoints\Receivers\DmRmc4kZ100CController.cs" />
<Compile Include="Endpoints\Receivers\DmRmc4kZScalerCController.cs" />
<Compile Include="Endpoints\Transmitters\TxInterfaces.cs" />
<Compile Include="IDmSwitch.cs" />
<Compile Include="Config\DmpsRoutingConfig.cs" />