summaryrefslogtreecommitdiffstats
path: root/host/AUTHORS
diff options
context:
space:
mode:
authorJosh Blum <josh@joshknows.com>2010-07-16 18:29:16 -0700
committerJosh Blum <josh@joshknows.com>2010-07-16 18:29:16 -0700
commitef0ca3b183c8526d5895ba918abffc9624bb2290 (patch)
tree8721d291dffc9dda04374378b47e931119fa4b0b /host/AUTHORS
parente1e3ed670ae4a2f8a4157977631ae8eed88f55b8 (diff)
parent1f1651ba46e55017bf598f0824b62be5ae2c5fd8 (diff)
downloaduhd-ef0ca3b183c8526d5895ba918abffc9624bb2290.tar.gz
uhd-ef0ca3b183c8526d5895ba918abffc9624bb2290.tar.bz2
uhd-ef0ca3b183c8526d5895ba918abffc9624bb2290.zip
Merge branch 'package'
Also tweaked pkg config file Conflicts: host/CMakeLists.txt
Diffstat (limited to 'host/AUTHORS')
-rw-r--r--host/AUTHORS16
1 files changed, 16 insertions, 0 deletions
diff --git a/host/AUTHORS b/host/AUTHORS
index d0fe52768..137eba0e6 100644
--- a/host/AUTHORS
+++ b/host/AUTHORS
@@ -1 +1,17 @@
+Matt Ettus - matt@ettus.com
+ USRP1/USRP2 FPGA code
+
Josh Blum - josh@ettus.com
+ driver framework
+ USRP2 firmware
+ USRP2 host code
+ Basic/LF host code
+ XCVR2450 host code
+ RFX Series host code
+
+Jason Abele - jason@ettus.com
+ RFX Series host code
+ WBX host code
+
+Eric Blossom - eb@comsec.com
+ USRP2 firmware