diff options
| author | Nick Foster <nick@nerdnetworks.org> | 2010-09-15 14:58:44 -0700 |
|---|---|---|
| committer | Nick Foster <nick@nerdnetworks.org> | 2010-09-15 14:58:44 -0700 |
| commit | ed245848df8cc011ae8fe30833ecc28049139db5 (patch) | |
| tree | da03d37de541826df734e8ab87e0b6114595afc8 /host/AUTHORS | |
| parent | 44ac4461407aae3e26b218a1ab1bd27f893c5e96 (diff) | |
| parent | 72646d1960b0c979afec225e741d7d89a827c7d0 (diff) | |
| download | uhd-ed245848df8cc011ae8fe30833ecc28049139db5.tar.gz uhd-ed245848df8cc011ae8fe30833ecc28049139db5.tar.bz2 uhd-ed245848df8cc011ae8fe30833ecc28049139db5.zip | |
Merge branch 'master' of ettus.sourcerepo.com:ettus/uhdpriv into usrp2p
Conflicts:
host/lib/usrp/usrp2/CMakeLists.txt
host/lib/usrp/usrp2/mboard_impl.cpp
host/lib/usrp/usrp2/usrp2_regs.hpp
Diffstat (limited to 'host/AUTHORS')
| -rw-r--r-- | host/AUTHORS | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/host/AUTHORS b/host/AUTHORS index 137eba0e6..e0775f3a1 100644 --- a/host/AUTHORS +++ b/host/AUTHORS @@ -1,5 +1,6 @@ Matt Ettus - matt@ettus.com - USRP1/USRP2 FPGA code + USRP1 FPGA code + USRP2 FPGA code Josh Blum - josh@ettus.com driver framework @@ -14,4 +15,15 @@ Jason Abele - jason@ettus.com WBX host code Eric Blossom - eb@comsec.com + USRP1 firmware USRP2 firmware + +Tom Tsou - ttsou@vt.edu + UHD-USB framework + LIBUSB host code + USRP1 host code + USRP1 firmware + +Nick Foster - nick@nerdnetworks.org + LIBUSB host code + USRP1 host code |