Dhanya Maliakal 0ef52138e1 merge conflict sorted, removing rest

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

..

include

merge conflict sorted, removing rest

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

src

merge conflict sorted, removing rest

2017-12-05 11:25:10 +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

merge from 3.0 hotfixes done

2017-10-18 17:39:19 +02: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

some more changes to make file for automatic versioning

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