summaryrefslogtreecommitdiffstats
path: root/firmware/fx2/AUTHORS
diff options
context:
space:
mode:
authorJosh Blum <josh@joshknows.com>2010-11-09 18:38:39 -0800
committerJosh Blum <josh@joshknows.com>2010-11-09 18:38:39 -0800
commit3bca8c492514564a065e34d3284cb468873fcc8c (patch)
tree73f11afc14eb62ac1c1ff5374dce9c3cb33c0278 /firmware/fx2/AUTHORS
parent073518083f2c7044d4b0c16948a192c5623d0752 (diff)
parentc0dfc2cf47b98734c4218427c7c6f5eb92025a9c (diff)
downloaduhd-3bca8c492514564a065e34d3284cb468873fcc8c.tar.gz
uhd-3bca8c492514564a065e34d3284cb468873fcc8c.tar.bz2
uhd-3bca8c492514564a065e34d3284cb468873fcc8c.zip
Merge branch 'master' into usrp_e_next
Diffstat (limited to 'firmware/fx2/AUTHORS')
-rw-r--r--firmware/fx2/AUTHORS4
1 files changed, 4 insertions, 0 deletions
diff --git a/firmware/fx2/AUTHORS b/firmware/fx2/AUTHORS
index e69de29bb..c9cd35778 100644
--- a/firmware/fx2/AUTHORS
+++ b/firmware/fx2/AUTHORS
@@ -0,0 +1,4 @@
+Eric Blossom <eb@comsec.org>
+Josh Blum <josh@joshknows.com>
+Thomas Tsou <ttsou@vt.edu>
+Nick Foster <nick@nerdnetworks.org>