Merge remote-tracking branch 'origin/feature/cisco-spark' into feature/ecs-407

This commit is contained in:
Heath Volmer
2017-09-14 10:23:15 -06:00
15 changed files with 4185 additions and 3403 deletions

View File

@@ -8,7 +8,7 @@ using Crestron.SimplSharpPro.DeviceSupport;
using PepperDash.Core;
using PepperDash.Essentials;
using PepperDash.Essentials.Core;
using PepperDash.Essentials.Core.SmartObjects;
using PepperDash.Essentials.Core.SmartObjects;
using PepperDash.Essentials.Devices.Common.VideoCodec;
namespace PepperDash.Essentials.UIDrivers.VC