summaryrefslogtreecommitdiff
path: root/gr-fft/python/__init__.py
diff options
context:
space:
mode:
authorTom Rondeau <trondeau@vt.edu>2012-12-29 20:26:35 -0500
committerTom Rondeau <trondeau@vt.edu>2012-12-29 20:26:35 -0500
commit0fb538e11e8425c4f15063e249dc0dae2d54ebd5 (patch)
treed4d4964feb7771c01b75a33be9d209389a8b4fc9 /gr-fft/python/__init__.py
parent4580aaf9583b1e8ca4b3ef1d3127c7d48566fe67 (diff)
parentc805168975a30af962fbd0a25c091d7b2113394e (diff)
Merge branch 'next_blocks' into next
Conflicts: gr-trellis/CMakeLists.txt gr-trellis/python/CMakeLists.txt
Diffstat (limited to 'gr-fft/python/__init__.py')
-rw-r--r--gr-fft/python/__init__.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/gr-fft/python/__init__.py b/gr-fft/python/__init__.py
index a532109b70..093cc3c696 100644
--- a/gr-fft/python/__init__.py
+++ b/gr-fft/python/__init__.py
@@ -25,4 +25,4 @@ processing blocks for FFT and related functions.
'''
from fft_swig import *
-from logpwrfft import *
+from window import *