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

diff --git a/gruel/src/lib/.gitignore b/gruel/src/lib/.gitignore
index 89a768d4685c43bdde8e820017ffc185bf80257f..165e179d677f6f00f8f71d3285da72d240113daa 100644 (file)
--- a/gruel/src/lib/.gitignore
+++ b/gruel/src/lib/.gitignore
@@ -2,3 +2,4 @@
 /Makefile.in
 /.libs
 /.deps
+test_gruel