Neil Dorin 214a740345 Merge branch 'feature/ecs-407' of http://code.pepperdash.net/scm/pec/essentials into feature/cisco-spark-2 ...

Conflicts:
	Essentials Devices Common/Essentials Devices Common/VideoCodec/VideoCodecBase.cs

2017-09-27 12:37:53 -06:00

..

PepperDashEssentialsBase

Merge branch 'feature/ecs-407' of http://code.pepperdash.net/scm/pec/essentials into feature/cisco-spark-2

2017-09-27 12:37:53 -06:00

PepperDashEssentialsBase.sln

Combining repos

2017-03-21 08:36:26 -06:00