Neil Dorin b793c04ad3 Merge branch 'bugfix/ecs-895' into feature/ecs-877 ... # Conflicts: # PepperDashEssentials/Properties/AssemblyInfo.cs # PepperDashEssentials/Room/Config/EssentialsRoomConfig.cs # Release Package/PepperDashEssentials.cpz # Release Package/PepperDashEssentials.dll		2018-10-08 13:30:18 -06:00
..
EssentialsHuddleSpaceRoom.cs	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
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	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
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
EssentialsPresentationRoom.cs	Merge and a whole bunch of work before committing merge, moron	2018-08-01 14:23:58 -06:00
EssentialsRoomBase.cs	Merge branch 'bugfix/ecs-895' into feature/ecs-877	2018-10-08 13:30:18 -06:00