[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 01/01: Merge branch 'master' into next
|
From: |
git |
|
Subject: |
[Commit-gnuradio] [gnuradio] 01/01: Merge branch 'master' into next |
|
Date: |
Tue, 26 Apr 2016 00:41:06 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
jcorgan pushed a commit to branch next
in repository gnuradio.
commit 9234a66b40996daeb2e85fd2eec808872f78400c
Merge: 77679de 6a33fff
Author: Johnathan Corgan <address@hidden>
Date: Mon Apr 25 17:29:00 2016 -0700
Merge branch 'master' into next
gr-audio/lib/windows/windows_sink.cc | 424 ++++++++++++++-----------
gr-audio/lib/windows/windows_sink.h | 13 +-
gr-blocks/lib/udp_source_impl.cc | 4 +-
gr-filter/include/gnuradio/filter/iir_filter.h | 18 +-
gr-qtgui/CMakeLists.txt | 1 +
gr-qtgui/examples/c++/CMakeLists.txt | 49 +++
gr-qtgui/examples/c++/display_qt.cc | 126 ++++++++
gr-qtgui/examples/c++/display_qt.h | 77 +++++
8 files changed, 515 insertions(+), 197 deletions(-)