diff options
author | Josh Blum <josh@joshknows.com> | 2011-01-19 22:23:46 -0800 |
---|---|---|
committer | Josh Blum <josh@joshknows.com> | 2011-01-19 22:23:46 -0800 |
commit | 9239878b0b81c3a368bf11cfc2fe48bfb05ff902 (patch) | |
tree | f41a5e58eac89b35cb99537a0a0b64662384a9f2 /firmware/zpu/AUTHORS | |
parent | fc138381ee4bd8d191795230b7447071a85e1f28 (diff) | |
parent | 7d918c5f6acc9a5d2c8ae03e2e67b403f7efd5ff (diff) | |
download | uhd-9239878b0b81c3a368bf11cfc2fe48bfb05ff902.tar.gz uhd-9239878b0b81c3a368bf11cfc2fe48bfb05ff902.tar.bz2 uhd-9239878b0b81c3a368bf11cfc2fe48bfb05ff902.zip |
Merge branch 'next'
Conflicts:
host/lib/usrp/usrp2/codec_impl.cpp
Diffstat (limited to 'firmware/zpu/AUTHORS')
-rw-r--r-- | firmware/zpu/AUTHORS | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/firmware/zpu/AUTHORS b/firmware/zpu/AUTHORS new file mode 100644 index 000000000..c230624fb --- /dev/null +++ b/firmware/zpu/AUTHORS @@ -0,0 +1,4 @@ +Eric Blossom <eb@comsec.com> +Matt Ettus <matt@ettus.com> +Josh Blum <josh@ettus.com> +Nick Foster <nick@ettus.com> |