diff options
author | Kenneth Mortensen <mortensenit@users.noreply.github.com> | 2015-04-22 11:39:19 +0200 |
---|---|---|
committer | Kenneth Mortensen <mortensenit@users.noreply.github.com> | 2015-04-22 11:39:19 +0200 |
commit | d45f9b924c54fc40c228b8d3709e93fed7720705 (patch) | |
tree | 1192e317e6fdfae692f67843400b698c49ee7a1f /AUTHORS | |
parent | 191817b42ad86a250bbff02895e9646f51531672 (diff) | |
parent | 81775f47227c5d08a05b43ffb3855bff0a237c1d (diff) | |
download | dabmod-d45f9b924c54fc40c228b8d3709e93fed7720705.tar.gz dabmod-d45f9b924c54fc40c228b8d3709e93fed7720705.tar.bz2 dabmod-d45f9b924c54fc40c228b8d3709e93fed7720705.zip |
Merge remote-tracking branch 'upstream/master'
Conflicts:
src/InputFileReader.cpp
Diffstat (limited to 'AUTHORS')
-rw-r--r-- | AUTHORS | 7 |
1 files changed, 7 insertions, 0 deletions
@@ -10,3 +10,10 @@ Matthias P. Braendli <matthias [at] mpb [dot] li> - Improvements in logging (log to file, to syslog) - ZeroMQ ETI input - Telnet remote-control + - ZeroMQ I/Q output + - I/Q conversion to signed 8-bit + - ARM support + +Jörgen Scott + - ZeroMQ remote control + - Static delay offset |