Merge branch 'flattopwindow' of http://gnuradio.org/git/jblum
authorJohnathan Corgan <jcorgan@corganenterprises.com>
Thu, 29 Oct 2009 13:52:53 +0000 (06:52 -0700)
committerJohnathan Corgan <jcorgan@corganenterprises.com>
Thu, 29 Oct 2009 13:52:53 +0000 (06:52 -0700)
commit8a0affcfb6154cadd1710e682fe09f040ed05a28
tree680e797323aa598ee497f20fc4a249c4d5aeb83c
parent005f14ca07e66056bdc8e33a0cae1d461f5e1b9d
parent230e062e51d43f389520207cf147838c666a1f21
Merge branch 'flattopwindow' of gnuradio.org/git/jblum

Merge-fix: Remove debugging print
Merge-fix: Update copyrights

* 'flattopwindow' of http://gnuradio.org/git/jblum:
  Added window option to wxgui fft and waterfall sink.
  redid cos windows, added flattop and nuttall_cfd
gnuradio-core/src/python/gnuradio/window.py
gr-wxgui/src/python/fftsink_gl.py
gr-wxgui/src/python/fftsink_nongl.py
gr-wxgui/src/python/waterfallsink_gl.py