diff options
author | Johnathan Corgan | 2009-09-09 17:11:02 -0700 |
---|---|---|
committer | Johnathan Corgan | 2009-09-09 17:11:02 -0700 |
commit | 101e510842241be068e7e56a666f8cd9b34de248 (patch) | |
tree | ab261a181866d0bac0c50a59965090a857f2806f /usrp2 | |
parent | 84d50d0f6ea9f3950afe0c543c983eb9a048a6fb (diff) | |
parent | 8d1ae2b08e07d621baeb486c05145acca1df7a08 (diff) | |
download | gnuradio-101e510842241be068e7e56a666f8cd9b34de248.tar.gz gnuradio-101e510842241be068e7e56a666f8cd9b34de248.tar.bz2 gnuradio-101e510842241be068e7e56a666f8cd9b34de248.zip |
Merge branch 'usrp_siggen' of http://gnuradio.org/git/jblum into master
* 'usrp_siggen' of http://gnuradio.org/git/jblum:
only import usrp and usrp2 modules in the setup methods
updated digital to use installed usrp options
tweaked ampl slider params
copied usrp_siggen stuff from experimental gui into gnuradio tree
Diffstat (limited to 'usrp2')
0 files changed, 0 insertions, 0 deletions