[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 02/04: Merge branch 'master' into next
|
From: |
git |
|
Subject: |
[Commit-gnuradio] [gnuradio] 02/04: Merge branch 'master' into next |
|
Date: |
Sun, 5 Apr 2015 23:58:09 +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 a8f603f23fcb2fce7eaa21cec0753d8393748afb
Merge: 61c4e2f 4ed2622
Author: Johnathan Corgan <address@hidden>
Date: Sun Apr 5 16:24:41 2015 -0700
Merge branch 'master' into next
docs/doxygen/doxyxml/example/Doxyfile | 1534 --------------------
docs/doxygen/doxyxml/example/aadvark.cc | 50 -
docs/doxygen/doxyxml/example/aadvark.h | 44 -
docs/doxygen/doxyxml/example/xml/aadvark_8cc.xml | 88 --
docs/doxygen/doxyxml/example/xml/aadvark_8h.xml | 72 -
docs/doxygen/doxyxml/example/xml/classAadvark.xml | 86 --
docs/doxygen/doxyxml/example/xml/combine.xslt | 15 -
docs/doxygen/doxyxml/example/xml/compound.xsd | 814 -----------
docs/doxygen/doxyxml/example/xml/index.xml | 17 -
docs/doxygen/doxyxml/example/xml/index.xsd | 66 -
gnuradio-runtime/include/gnuradio/hier_block2.h | 18 +-
gnuradio-runtime/lib/hier_block2.cc | 78 +-
gnuradio-runtime/lib/hier_block2_detail.cc | 5 +-
gr-blocks/examples/vector_source_with_tags.grc | 329 +++--
gr-blocks/grc/blocks_block_tree.xml | 4 +
gr-blocks/grc/blocks_tag_object.xml | 55 +
.../include/gnuradio/qtgui/TimeDomainDisplayPlot.h | 2 +
gr-qtgui/include/gnuradio/qtgui/timecontrolpanel.h | 6 +-
gr-qtgui/include/gnuradio/qtgui/timedisplayform.h | 1 +
gr-qtgui/lib/TimeDomainDisplayPlot.cc | 13 +
gr-qtgui/lib/timecontrolpanel.cc | 27 +-
gr-qtgui/lib/timedisplayform.cc | 7 +
22 files changed, 387 insertions(+), 2944 deletions(-)