Neil Dorin fa141c6207 Merge remote-tracking branch 'origin/maintenance/KPMG' into feature/ecs-1123 ...

# Conflicts:
#	PepperDashEssentials/Bridges/BridgeBase.cs
#	PepperDashEssentials/ControlSystem.cs

2019-07-09 16:49:37 -06:00

..

EssentialsVideoCodecUiDriver.cs

Merge remote-tracking branch 'origin/maintenance/KPMG' into feature/ecs-1123

2019-07-09 16:49:37 -06:00

EssentialsVideoCodecUiDriver.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