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
..
Behaviours	Updated EssentialsRoomBase and both extented types to use ReconfigurableDevice. Tested Fusion Custom Properties successfully updating room name and help message.	2018-09-14 21:26:25 -06:00
Config	Merge remote-tracking branch 'origin/bugfix/mob-470' into feature/ecs-967	2018-12-12 13:34:32 -07:00
Emergency	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
Types	Removed Cue from Feedback	2018-10-08 15:49:21 -06:00