summaryrefslogtreecommitdiffstats
path: root/host/AUTHORS
diff options
context:
space:
mode:
authorJosh Blum <josh@joshknows.com>2010-09-30 15:03:04 -0700
committerJosh Blum <josh@joshknows.com>2010-09-30 15:03:04 -0700
commitccb7adcb150ae481ce08d4e0fa32641b5aec4e6e (patch)
tree111e27a507d711f890f99ea47c57f25757482e03 /host/AUTHORS
parent507283b3d43d653bf7ff1b2aa04f3d642297c9b1 (diff)
parent790a5ac665144180cde712d46b799a115bb74e46 (diff)
downloaduhd-ccb7adcb150ae481ce08d4e0fa32641b5aec4e6e.tar.gz
uhd-ccb7adcb150ae481ce08d4e0fa32641b5aec4e6e.tar.bz2
uhd-ccb7adcb150ae481ce08d4e0fa32641b5aec4e6e.zip
Merge branch 'master' into usrp_e_next
Diffstat (limited to 'host/AUTHORS')
-rw-r--r--host/AUTHORS3
1 files changed, 2 insertions, 1 deletions
diff --git a/host/AUTHORS b/host/AUTHORS
index e0775f3a1..512d4752e 100644
--- a/host/AUTHORS
+++ b/host/AUTHORS
@@ -24,6 +24,7 @@ Tom Tsou - ttsou@vt.edu
USRP1 host code
USRP1 firmware
-Nick Foster - nick@nerdnetworks.org
+Nick Foster - nick@ettus.com
LIBUSB host code
USRP1 host code
+ TVRX host code