Dhanya Maliakal d6bdbf8524 Merge branch '3.0.1' into developer

2017-12-11 13:51:20 +01:00

..

include

solved conflicts from merge of version being used to binary

2017-12-06 19:07:06 +01:00

src

Merge branch '3.0.1' into developer

2017-12-11 13:51:20 +01:00

.gitignore

.project added to gitignore

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

CMakeLists.txt

REST implementation removed from slsReceiver

2017-12-05 11:03:52 +01:00

gitInfo.txt

changed all variables from svn to git, included --version for receiver binary

2017-12-06 10:29:57 +01:00

Makefile

merge conflict sorted, removing rest

2017-12-05 11:25:10 +01:00

slsReceiverUsers.doxy

added receiver interface, have not separated from eigerDummyReceiver yet

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

updateGitVersion.sh

changed all variables from svn to git, included --version for receiver binary

2017-12-06 10:29:57 +01:00