[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: |
Sun, 29 Mar 2015 01:19:02 +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 55076ee7334b23469b6726cdd62f8d644d790b8f
Merge: 65df3e3 ebae0c4
Author: Johnathan Corgan <address@hidden>
Date: Sat Mar 28 18:15:16 2015 -0700
Merge branch 'master' into next
docs/doxygen/other/ctrlport.dox | 2 +-
docs/doxygen/other/metadata.dox | 18 ++++++-------
docs/doxygen/other/msg_passing.dox | 14 +++++-----
docs/doxygen/other/ofdm.dox | 16 ++++++------
docs/doxygen/other/packet_txrx.dox | 8 +++---
docs/doxygen/other/perf_counters.dox | 2 +-
docs/doxygen/other/pfb_intro.dox | 8 +++---
docs/doxygen/other/pmt.dox | 22 ++++++++--------
docs/doxygen/other/stream_tags.dox | 14 +++++-----
docs/doxygen/other/tagged_stream_blocks.dox | 34 ++++++++++++-------------
gr-analog/doc/analog.dox | 2 +-
gr-audio/doc/audio.dox | 4 +--
gr-blocks/doc/blocks.dox | 3 ++-
gr-channels/doc/channels.dox | 2 +-
gr-digital/doc/digital.dox | 4 +--
gr-fcd/doc/fcd.dox | 4 +--
gr-fec/doc/fec.dox | 2 +-
gr-fft/doc/fft.dox | 4 +--
gr-filter/doc/filter.dox | 8 +++---
gr-filter/python/filter/design/filter_design.py | 2 +-
gr-filter/python/filter/gui/polezero_plot.py | 6 +++--
gr-qtgui/doc/qtgui.dox | 10 ++++----
gr-qtgui/lib/FrequencyDisplayPlot.cc | 3 +--
gr-qtgui/lib/freq_sink_c_impl.cc | 5 +++-
gr-qtgui/lib/freq_sink_f_impl.cc | 5 +++-
gr-uhd/doc/uhd.dox | 5 ++--
gr-vocoder/doc/vocoder.dox | 4 +--
gr-zeromq/docs/zeromq.dox | 2 +-
28 files changed, 111 insertions(+), 102 deletions(-)