diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2012-12-29 20:26:35 -0500 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2012-12-29 20:26:35 -0500 |
| commit | 0fb538e11e8425c4f15063e249dc0dae2d54ebd5 (patch) | |
| tree | d4d4964feb7771c01b75a33be9d209389a8b4fc9 /gr-fft/grc | |
| parent | 4580aaf9583b1e8ca4b3ef1d3127c7d48566fe67 (diff) | |
| parent | c805168975a30af962fbd0a25c091d7b2113394e (diff) | |
Merge branch 'next_blocks' into next
Conflicts:
gr-trellis/CMakeLists.txt
gr-trellis/python/CMakeLists.txt
Diffstat (limited to 'gr-fft/grc')
| -rw-r--r-- | gr-fft/grc/fft_fft_vxx.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gr-fft/grc/fft_fft_vxx.xml b/gr-fft/grc/fft_fft_vxx.xml index 69f12ace77..028721fe25 100644 --- a/gr-fft/grc/fft_fft_vxx.xml +++ b/gr-fft/grc/fft_fft_vxx.xml @@ -8,7 +8,7 @@ <name>FFT</name> <key>fft_vxx</key> <import>from gnuradio import fft</import> - <import>from gnuradio import window</import> + <import>from gnuradio.fft import window</import> <make>#if $type() == "complex" fft.fft_vcc($fft_size, $forward, $window, $shift, $nthreads) #else |