Dhanya Maliakal 9f152ce1f3 merge conflict resolved

2017-12-01 12:44:34 +01:00

..

include

merge conflict from 3.0.1 to restream stop from recieveR

2017-11-30 19:05:47 +01:00

src

merge conflict resolved

2017-12-01 12:44:34 +01:00

.gitignore

.project added to gitignore

2017-10-12 15:08:12 +02:00

CMakeLists.txt

no changE

2017-08-04 15:40:21 +02:00

gitInfo.txt

merge from 3.0 hotfixes done

2017-10-18 17:39:19 +02:00

Makefile

removed setframeindexenable from being set by client, redundant. removed read_frame from list of functions, obsolete.

2017-09-22 12:25:08 +02:00

slsReceiverUsers.doxy

added receiver interface, have not separated from eigerDummyReceiver yet

2014-07-18 12:27:32 +02:00

updateGitVersion.sh

some more changes to make file for automatic versioning

2017-07-10 11:20:26 +02:00