Neil Dorin c99ba9ca1d Merge branch 'feature/ecs-1188' into bugfix/ecs-1192 ... # Conflicts: # PepperDashEssentials/Room/Types/EssentialsHuddleVtc1Room.cs # essentials-framework/Essentials Core/PepperDashEssentialsBase/Routing/RoutingPort.cs		2019-11-27 11:22:27 -07:00
..
DummyRoutingInputsDevice.cs	Adds USB routing to DmChassisController and DmChassisControllerBridge.	2019-08-15 14:07:10 -06:00
ICardPortsDevice.cs	Removes essentials-framework as a submodule and brings the files back into the main repo	2019-07-09 17:21:53 -06:00
IRoutingInputsExtensions.cs	Adds USB routing to DmChassisController and DmChassisControllerBridge.	2019-08-15 14:07:10 -06:00
RoutingInterfaces.cs	Removed all references to "Cotija" and replaced with "MobileControl". Progress on multi display routing in room logic and Mobile Control bridging.	2019-11-15 22:03:45 -07:00
RoutingPort.cs	Corrects issues with order of operations so that InCallFeedback isn't null when dependent routines check it's state.	2019-11-27 10:32:21 -07:00
RoutingPortCollection.cs	Removes essentials-framework as a submodule and brings the files back into the main repo	2019-07-09 17:21:53 -06:00
RoutingPortNames.cs	Removes essentials-framework as a submodule and brings the files back into the main repo	2019-07-09 17:21:53 -06:00
TieLine.cs	Removes essentials-framework as a submodule and brings the files back into the main repo	2019-07-09 17:21:53 -06:00
TieLineConfig.cs	Removes essentials-framework as a submodule and brings the files back into the main repo	2019-07-09 17:21:53 -06:00