[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: |
Mon, 7 Jul 2014 14:55:37 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
trondeau pushed a commit to branch next
in repository gnuradio.
commit 326685a44615faa1ddef830a73d0ff3ff8b46179
Merge: c719858 403933e
Author: Tom Rondeau <address@hidden>
Date: Mon Jul 7 10:54:18 2014 -0400
Merge branch 'master' into next
gr-blocks/include/gnuradio/blocks/char_to_short.h | 7 ++++---
gr-blocks/include/gnuradio/blocks/delay.h | 3 +++
.../include/gnuradio/blocks/file_descriptor_sink.h | 3 ++-
.../include/gnuradio/blocks/file_descriptor_source.h | 3 ++-
gr-blocks/include/gnuradio/blocks/short_to_char.h | 4 ++++
gr-filter/lib/firdes.cc | 2 +-
gr-qtgui/include/gnuradio/qtgui/freq_sink_c.h | 14 +++++++++-----
gr-qtgui/include/gnuradio/qtgui/freq_sink_f.h | 14 +++++++++-----
gr-qtgui/include/gnuradio/qtgui/sink_c.h | 14 +++++++++-----
gr-qtgui/include/gnuradio/qtgui/sink_f.h | 15 ++++++++++-----
gr-qtgui/include/gnuradio/qtgui/waterfall_sink_c.h | 14 +++++++++-----
gr-qtgui/include/gnuradio/qtgui/waterfall_sink_f.h | 14 +++++++++-----
gr-qtgui/lib/freq_sink_c_impl.cc | 10 ++++------
gr-qtgui/lib/freq_sink_f_impl.cc | 10 ++++------
gr-qtgui/lib/freqdisplayform.cc | 4 +---
gr-qtgui/lib/sink_c_impl.cc | 11 +++++------
gr-qtgui/lib/sink_c_impl.h | 2 +-
gr-qtgui/lib/sink_f_impl.cc | 20 ++++++++++++++------
gr-qtgui/lib/sink_f_impl.h | 3 ++-
gr-qtgui/lib/spectrumdisplayform.cc | 2 +-
gr-qtgui/lib/waterfall_sink_c_impl.cc | 10 ++++------
gr-qtgui/lib/waterfall_sink_f_impl.cc | 10 ++++------
gr-qtgui/lib/waterfalldisplayform.cc | 4 +---
23 files changed, 112 insertions(+), 81 deletions(-)