Dhanya Thattil b58c3e8951 solving merging conflicts from 3.1.0 to developer

2018-03-14 15:45:35 +01:00

..

include

solving merging conflicts from 3.1.0 to developer

2018-03-14 15:45:35 +01:00

src

solving merging conflicts from 3.1.0 to developer

2018-03-14 15:45:35 +01:00

.gitignore

.project added to gitignore

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

CMakeLists.txt

reverting locations

2018-02-08 10:54:07 +01:00

gitInfo.txt

updated binaries, updated manuals, updated git versioning

2018-03-12 14:21:02 +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