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
..
DDVC01RoomPropertiesConfig.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
EssentialsHuddleRoomPropertiesConfig.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
EssentialsHuddleVtc1PropertiesConfig.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
EssentialsPresentationPropertiesConfig.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
EssentialsRoomConfig.cs	Merge branch 'bugfix/ecs-895' into feature/ecs-877	2018-10-08 13:30:18 -06:00
EssentialsRoomEmergencyConfig.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