Neil Dorin 676526ed48 Merge remote-tracking branch 'origin/bugfix/mob-470' into feature/ecs-967 ... # Conflicts: # PepperDashEssentials/AppServer/CotijaSystemController.cs # PepperDashEssentials/AppServer/RoomBridges/CotijaDdvc01RoomBridge.cs # PepperDashEssentials/ControlSystem.cs # PepperDashEssentials/OTHER/Fusion/EssentialsHuddleSpaceFusionSystemControllerBase.cs # PepperDashEssentials/OTHER/Fusion/EssentialsHuddleVtc1FusionController.cs # PepperDashEssentials/Properties/AssemblyInfo.cs # PepperDashEssentials/UIDrivers/EssentialsHuddle/EssentialsHuddlePanelAvFunctionsDriver.cs # devjson commands.json		2018-12-12 13:34:32 -07:00
..
EssentialsHuddleSpaceFusionSystemControllerBase.cs	Renamed Config in Essentials room type classes to PropertiesConfig and modified EssentialsRoomBase to derive from ReconfigurableDevice	2018-09-13 16:50:08 -06:00
EssentialsHuddleVtc1FusionController.cs	Merge remote-tracking branch 'origin/bugfix/mob-470' into feature/ecs-967	2018-12-12 13:34:32 -07:00
FusionCustomPropertiesBridge.cs	Updates from testing UI reconnecting to room after room properties update from Fusion	2018-09-18 17:53:33 -06:00
FusionEventHandlers.cs	cleaned out framework files; added framework submodule; referneced p.core to reference in framework; moved essentials.sln; changed paths in sln to match; test build	2018-06-28 13:59:14 -06:00
FusionProcessorQueries.cs	cleaned out framework files; added framework submodule; referneced p.core to reference in framework; moved essentials.sln; changed paths in sln to match; test build	2018-06-28 13:59:14 -06:00
FusionRviDataClasses.cs	cleaned out framework files; added framework submodule; referneced p.core to reference in framework; moved essentials.sln; changed paths in sln to match; test build	2018-06-28 13:59:14 -06:00
FusionSystemController.cs.orig	cleaned out framework files; added framework submodule; referneced p.core to reference in framework; moved essentials.sln; changed paths in sln to match; test build	2018-06-28 13:59:14 -06:00