pepperdash/PepperDashCore
1
0
Fork 0
mirror of https://github.com/PepperDash/PepperDashCore.git synced 2026-04-13 12:36:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

Added hybrid ipid/tcp eControlType for HD-MD things

Browse source
This commit is contained in:
Heath Volmer 2018-02-06 12:40:50 -07:00
parent 292183098f
commit 4409644cf7
5 changed files with 13 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
Pepperdash Core/Pepperdash Core.suo
View file

Binary file not shown.

BIN
Pepperdash Core/Pepperdash Core.suo.orig Normal file
View file

Binary file not shown.

2
Pepperdash Core/Pepperdash Core/Comm/eControlMethods.cs
View file

@ -8,6 +8,6 @@ namespace PepperDash.Core
{
public enum eControlMethod
{
None = 0, Com, IpId, IR, Ssh, Tcpip, Telnet, Cresnet
None = 0, Com, IpId, IpidTcp, IR, Ssh, Tcpip, Telnet, Cresnet
}
}

2
Pepperdash Core/Pepperdash Core/Properties/AssemblyInfo.cs
View file

@ -4,4 +4,4 @@
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("Pepperdash_Core")]
[assembly: AssemblyCopyright("Copyright © PepperDash 2016")]
[assembly: AssemblyVersion("1.0.3.*")]
[assembly: AssemblyVersion("1.0.4.*")]

11
Pepperdash Core/Pepperdash Core/Properties/AssemblyInfo.cs.orig Normal file
View file

@ -0,0 +1,11 @@
using System.Reflection;
[assembly: AssemblyTitle("Pepperdash_Core")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("Pepperdash_Core")]
[assembly: AssemblyCopyright("Copyright © PepperDash 2016")]
<<<<<<< HEAD
[assembly: AssemblyVersion("1.0.2.*")]
=======
[assembly: AssemblyVersion("1.0.3.*")]
>>>>>>> e16c2cbee87c631bf84ad9634bfbc25bbec78a31