Neil Dorin 3b3ea98dea Merge remote-tracking branch 'origin/feature/ecs-407' into feature/cisco-spark-2 ... Conflicts: Essentials Devices Common/Essentials Devices Common/Codec/CodecActiveCallItem.cs Essentials Devices Common/Essentials Devices Common/Codec/eCodecCallStatus.cs Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/CiscoCodec.cs Essentials Devices Common/Essentials Devices Common/VideoCodec/VideoCodecBase.cs		2017-09-21 11:57:48 -06:00
..
Audio	Combining repos	2017-03-21 08:36:26 -06:00
Codec	Merge remote-tracking branch 'origin/feature/ecs-407' into feature/cisco-spark-2	2017-09-21 11:57:48 -06:00
Crestron/Gateways	Combining repos	2017-03-21 08:36:26 -06:00
DiscPlayer	Implemented Device Usage feature for Fusion.	2017-08-18 12:37:09 -06:00
Display	Fixed share button sync issues around power off dialogs	2017-08-25 15:16:21 -06:00
DSP	Fixed share button sync issues around power off dialogs	2017-08-25 15:16:21 -06:00
Factory	Mock testing: Connect/End UI behavior start	2017-09-13 11:39:22 -06:00
Generic	Commit before merge. Updates to source device usage triggers based on room source routing	2017-08-24 15:43:12 -06:00
PC	Very elusive null ref in routing/usage tracking; adding bits and pieces to codecs	2017-09-15 10:01:18 -06:00
Properties	Combining repos	2017-03-21 08:36:26 -06:00
References	EOD commit. Working on integrating Crestron OBTP library	2017-09-15 17:02:22 -06:00
SetTopBox	Implemented Device Usage feature for Fusion.	2017-08-18 12:37:09 -06:00
Streaming	Combining repos	2017-03-21 08:36:26 -06:00
VideoCodec	Merge remote-tracking branch 'origin/feature/ecs-407' into feature/cisco-spark-2	2017-09-21 11:57:48 -06:00
Essentials Devices Common.csproj	Merge remote-tracking branch 'origin/feature/ecs-407' into feature/cisco-spark-2	2017-09-20 18:19:03 -06:00