Neil Dorin 0cf77f1c51 Merge remote-tracking branch 'origin/development' into maintenance/PR-1 ... # Conflicts: # Pepperdash Core/Pepperdash Core/Properties/AssemblyInfo.cs		2019-05-23 14:10:26 -06:00
..
Pepperdash Core	Merge remote-tracking branch 'origin/development' into maintenance/PR-1	2019-05-23 14:10:26 -06:00
Pepperdash Core.sln	Working on Dynamic Server. Also updated the Generic Socket event args class to be just event args class and contain other event args as well. Should not affect anything as I did not change the name of the event args class defined, just changed the file name to show that it has multiple EventArgs definitions.	2017-03-14 18:26:13 -07:00
Pepperdash Core.slnold	Working on Dynamic Server. Also updated the Generic Socket event args class to be just event args class and contain other event args as well. Should not affect anything as I did not change the name of the event args class defined, just changed the file name to show that it has multiple EventArgs definitions.	2017-03-14 18:26:13 -07:00
Pepperdash Core.suo.orig	Added hybrid ipid/tcp eControlType for HD-MD things	2018-02-06 12:40:50 -07:00