Neil Dorin fa141c6207 Merge remote-tracking branch 'origin/maintenance/KPMG' into feature/ecs-1123 ... # Conflicts: # PepperDashEssentials/Bridges/BridgeBase.cs # PepperDashEssentials/ControlSystem.cs		2019-07-09 16:49:37 -06:00
..
Environment Drivers	Brings in changes from On Prem BB repo. Resolves ecs-756/757/758/759	2018-07-12 16:55:49 -06:00
Essentials	Renamed Config in Essentials room type classes to PropertiesConfig and modified EssentialsRoomBase to derive from ReconfigurableDevice	2018-09-13 16:50:08 -06:00
EssentialsHuddle	Merge remote-tracking branch 'origin/bugfix/mob-470' into feature/ecs-967	2018-12-12 13:34:32 -07:00
EssentialsHuddleVTC	Adds fake directory to MockVC with full features	2019-03-08 16:56:37 -07:00
Page Drivers	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
VC	Merge remote-tracking branch 'origin/maintenance/KPMG' into feature/ecs-1123	2019-07-09 16:49:37 -06:00
DualDisplayRouting.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
enums and base.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
JoinedSigInterlock.cs	Brings in changes from On Prem BB repo. Resolves ecs-756/757/758/759	2018-07-12 16:55:49 -06:00
SigInterlock.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
SmartObjectRoomsList.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
SourceChangeArgs.cs	Merge and a whole bunch of work before committing merge, moron	2018-08-01 14:23:58 -06:00