Merge branch 'master' into IAX

This commit is contained in:
Jonathan Naylor
2024-10-04 17:31:36 +01:00
20 changed files with 510 additions and 110 deletions

View File

@@ -155,6 +155,9 @@
<ClInclude Include="Thread.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="DMRTrellis.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="DMRAccessControl.h">
<Filter>Header Files</Filter>
</ClInclude>
@@ -206,6 +209,9 @@
<ClInclude Include="NetworkInfo.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="P25Trellis.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="NXDNDefines.h">
<Filter>Header Files</Filter>
</ClInclude>
@@ -356,9 +362,6 @@
<ClInclude Include="RS.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Trellis.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="BPTC19696.cpp">
@@ -487,6 +490,9 @@
<ClCompile Include="Thread.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="DMRTrellis.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="DMRAccessControl.cpp">
<Filter>Source Files</Filter>
</ClCompile>
@@ -535,6 +541,9 @@
<ClCompile Include="NetworkInfo.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="P25Trellis.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="NXDNControl.cpp">
<Filter>Source Files</Filter>
</ClCompile>
@@ -670,8 +679,5 @@
<ClCompile Include="RS634717.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="Trellis.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
</Project>