From: Johnathan Corgan <jcorgan@corganenterprises.com>
Date: Thu, 10 Sep 2009 00:11:02 +0000 (-0700)
Subject: Merge branch 'usrp_siggen' of http://gnuradio.org/git/jblum into master
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=101e510842241be068e7e56a666f8cd9b34de248;p=debian%2Fgnuradio

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
---

101e510842241be068e7e56a666f8cd9b34de248