Neil Dorin ff5fab4984 Merge remote-tracking branch 'origin/feature/ecs-407' into feature/cisco-spark-2 ...

Conflicts:
	Essentials Devices Common/Essentials Devices Common/Codec/CodecActiveCallItem.cs

2017-09-20 18:19:03 -06:00

..

.IHasFeedbacks_BASE_3692.cs.swp

Finished merge with 307

2017-08-22 10:48:27 -06:00

.IHasFeedbacks_LOCAL_3692.cs.swp

Finished merge with 307

2017-08-22 10:48:27 -06:00

.IHasFeedbacks_REMOTE_3692.cs.swp

Finished merge with 307

2017-08-22 10:48:27 -06:00

CodecInterfaces.cs

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

2017-09-20 18:19:03 -06:00

CodecInterfaces.cs.orig

Fixing up basic UI switchs

2017-09-19 12:09:20 -06:00

DeviceJsonApi.cs

esc-337, found errant timer resets on comm monitor and Sammy display

2017-08-16 15:26:46 -06:00

DeviceManager.cs

Added Simulate receive on com port

2017-08-16 11:15:49 -06:00

DisplayUiConstants.cs

Combining repos

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

FIND HOMES Interfaces.cs

Combining repos

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

GenericMonitoredTcpDevice.cs

Combining repos

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

IAttachVideoStatusExtensions.cs

Combining repos

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

IHasFeedbacks_BACKUP_3692.cs

Finished merge with 307

2017-08-22 10:48:27 -06:00

IHasFeedbacks_BASE_3692.cs

Finished merge with 307

2017-08-22 10:48:27 -06:00

IHasFeedbacks_LOCAL_3692.cs

Finished merge with 307

2017-08-22 10:48:27 -06:00

IHasFeedbacks_REMOTE_3692.cs

Finished merge with 307

2017-08-22 10:48:27 -06:00

IHasFeedbacks.cs

Updates to Fusion classes to support NYU deployment

2017-08-17 00:39:11 -06:00

IHasSharing.cs

Updates to Video Codec Interfaces

2017-09-12 14:04:20 -06:00

IrOutputPortController.cs

Combining repos

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

IUsageTracking.cs

Device Usage working when switching sources

2017-08-25 17:00:58 -06:00

IUsageTracking.cs.orig

Merge from feature/fusion-nyc

2017-08-28 15:02:11 -05:00

IVolumeAndAudioInterfaces.cs

Updated ICodecAudio interface to break out individual functions to their own interfaces and not assume all to be applied to VideoCodecBase. Updated affected classes as a result.

2017-09-15 11:47:45 -06:00

MOVED TO CORE Device.cs

Combining repos

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

NewInterfaces.cs

Combining repos

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

PresentationDeviceType.cs

Combining repos

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

REMOVE DefaultDevice.cs

Combining repos

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

REMOVE DeviceConfig.cs

Combining repos

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

REMOVE IHasFeedbacks.cs

Combining repos

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

REPLACE DvdDeviceBase.cs

Combining repos

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

REPLACE IrDvdBase.cs

Combining repos

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

REPLACE IrSetTopBoxBase.cs

Combining repos

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

SmartObjectBaseTypes.cs

Combining repos

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

SourceListItem.cs

Combining repos

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