Neil Dorin 43281f0db6 Merge remote-tracking branch 'origin/bugfix/weil20190610' into feature/ecs-1123 ...

# Conflicts:
#	PepperDashEssentials/ControlSystem.cs
#	PepperDashEssentials/Properties/AssemblyInfo.cs

2019-07-09 16:52:23 -06:00

..

DeviceTypeInterfaces

Moved cotija classes into appserver folder; adding VideoCodecBaseMessenger class

2018-08-03 15:50:20 -06:00

Messengers

Merge remote-tracking branch 'origin/bugfix/weil20190610' into feature/ecs-1123

2019-07-09 16:52:23 -06:00

RoomBridges

Various fixes

2019-06-11 10:15:38 -06:00

CotijaConfig.cs

Moved cotija classes into appserver folder; adding VideoCodecBaseMessenger class

2018-08-03 15:50:20 -06:00

CotijaDdvc01DeviceBridge.cs

Moved cotija classes into appserver folder; adding VideoCodecBaseMessenger class

2018-08-03 15:50:20 -06:00

CotijaSystemController.cs

Merge fixup

2019-05-22 09:32:48 -06:00

Interfaces.cs

Moved cotija classes into appserver folder; adding VideoCodecBaseMessenger class

2018-08-03 15:50:20 -06:00

Volumes.cs

Modified volumes format; added config for VC cameras and recents

2019-06-10 11:59:09 -06:00