diff options
author | Michael West <michael.west@ettus.com> | 2013-12-06 17:47:24 -0800 |
---|---|---|
committer | Michael West <michael.west@ettus.com> | 2013-12-06 17:47:24 -0800 |
commit | c3aa7326095a1a8c744e269a04572de74600df8d (patch) | |
tree | 983711ae9718128617b5f1880f8c6399e38e4055 /README.txt | |
parent | aa3d9a9da0405e84e720870a13718b177d85652c (diff) | |
parent | 8f0f045cdac16ae84bc446b230beb2b651428294 (diff) | |
download | uhd-c3aa7326095a1a8c744e269a04572de74600df8d.tar.gz uhd-c3aa7326095a1a8c744e269a04572de74600df8d.tar.bz2 uhd-c3aa7326095a1a8c744e269a04572de74600df8d.zip |
Merge branch 'master' into mwest_coverity
Conflicts:
host/lib/usrp/b200/b200_iface.cpp
Diffstat (limited to 'README.txt')
-rw-r--r-- | README.txt | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/README.txt b/README.txt deleted file mode 100644 index 64066d522..000000000 --- a/README.txt +++ /dev/null @@ -1,19 +0,0 @@ -######################################################################## -## Welcome to the USRP source code tree -######################################################################## - -host/ - - Description: source code for user-space driver - -firmware/ - - Description: source code for various micro processors - -fpga/ - - Description: source code for FPGA designs - -images/ - - Description: package builder for FPGA and firmware images |