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)
* '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


Trivial merge