lib/csharp/se/lth/control/labcomm2014/EncoderChannel.cs · d392188244b0a3369b5790fb08c7121fb6f5da5b · Anders Blomdell / LabComm

9 years ago

Merge branch 'master' into intentions_rebased · f2be82a5

Sven Gestegård Robertz authored 9 years ago

Conflicts:
	lib/c/2014/test/test_labcomm_renaming_encoder.c
	lib/csharp/se/lth/control/labcomm2014/DecoderChannel.cs
	lib/csharp/se/lth/control/labcomm2014/EncoderChannel.cs

f2be82a5

History

Merge branch 'master' into intentions_rebased

Sven Gestegård Robertz authored 9 years ago

Conflicts:
	lib/c/2014/test/test_labcomm_renaming_encoder.c
	lib/csharp/se/lth/control/labcomm2014/DecoderChannel.cs
	lib/csharp/se/lth/control/labcomm2014/EncoderChannel.cs