Merge branch 'usrp_siggen' of http://gnuradio.org/git/jblum into master
authorJohnathan Corgan <jcorgan@corganenterprises.com>
Thu, 10 Sep 2009 00:11:02 +0000 (17:11 -0700)
committerJohnathan Corgan <jcorgan@corganenterprises.com>
Thu, 10 Sep 2009 00:11:02 +0000 (17:11 -0700)
commit101e510842241be068e7e56a666f8cd9b34de248
treeab261a181866d0bac0c50a59965090a857f2806f
parent84d50d0f6ea9f3950afe0c543c983eb9a048a6fb
parent8d1ae2b08e07d621baeb486c05145acca1df7a08
Merge branch 'usrp_siggen' of 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