MeshCentral/MeshCentralRouter
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshCentralRouter synced 2025-12-06 00:13:33 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Troy Cook
2020-11-22 16:57:17 -06:00
committed by GitHub
parent a008d1a5e6 a8e9615e37
commit 24baface6d
28 changed files with 6132 additions and 574 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
MeshCentralRouter.csproj
View File

@@ -100,6 +100,12 @@
<Compile Include="AppLaunchForm.Designer.cs">
<DependentUpon>AppLaunchForm.cs</DependentUpon>
</Compile>
<Compile Include="DeviceSettingsForm.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="DeviceSettingsForm.Designer.cs">
<DependentUpon>DeviceSettingsForm.cs</DependentUpon>
</Compile>
<Compile Include="FileDeletePromptForm.cs">
<SubType>Form</SubType>
</Compile>
@@ -229,6 +235,12 @@
<Compile Include="SettingsForm.Designer.cs">
<DependentUpon>SettingsForm.cs</DependentUpon>
</Compile>
<Compile Include="UpdateForm.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="UpdateForm.Designer.cs">
<DependentUpon>UpdateForm.cs</DependentUpon>
</Compile>
<Compile Include="WebSocketClient.cs" />
<Compile Include="Win32Api.cs" />
<EmbeddedResource Include="AddPortMapForm.cs.resx">
@@ -384,6 +396,9 @@
<EmbeddedResource Include="AppLaunchForm.zh-chs.resx">
<DependentUpon>AppLaunchForm.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="DeviceSettingsForm.resx">
<DependentUpon>DeviceSettingsForm.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="DeviceUserControl.cs.resx">
<DependentUpon>DeviceUserControl.cs</DependentUpon>
</EmbeddedResource>
@@ -744,6 +759,9 @@
<EmbeddedResource Include="SettingsForm.zh-chs.resx">
<DependentUpon>SettingsForm.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="UpdateForm.resx">
<DependentUpon>UpdateForm.cs</DependentUpon>
</EmbeddedResource>
<None Include="app.manifest">
<SubType>Designer</SubType>
</None>