Neil Dorin f27b6fadb9 Merge branch 'development' into feature/ecs-1209 ... # Conflicts: # PepperDashEssentials/Room/Types/EssentialsHuddleSpaceRoom.cs # PepperDashEssentials/Room/Types/EssentialsHuddleVtc1Room.cs # essentials-framework/Essentials Devices Common/Essentials Devices Common/DSP/DspBase.cs # essentials-framework/Essentials Devices Common/Essentials Devices Common/Power Controllers/Digitallogger.cs		2020-03-10 14:23:17 -06:00
..
EssentialsDualDisplayRoom.cs	Updates to IRunRouteAction to require specification of sourceListKey	2019-12-04 22:36:25 -07:00
EssentialsHuddleSpaceRoom.cs	Adds logging for room on/off and occupancy events	2020-01-13 21:54:12 -07:00
EssentialsHuddleSpaceRoom.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
EssentialsHuddleVtc1Room.cs	Merge remote-tracking branch 'origin/development' into feature/ecs-1209	2020-01-16 19:21:29 -07:00
EssentialsHuddleVtc1Room.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
EssentialsNDisplayRoomBase.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