commit-gnuradio
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Commit-gnuradio] git://gnuradio.org/gnuradio branch, next, updated. v3.


From: git version control
Subject: [Commit-gnuradio] git://gnuradio.org/gnuradio branch, next, updated. v3.6.2-610-gddb6ada
Date: Fri, 7 Dec 2012 18:08:36 +0000 (UTC)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "git://gnuradio.org/gnuradio".

The branch, next has been updated
       via  ddb6ada4dbd0fa8db97ba6f2f4d2d8cb4149c8f1 (commit)
       via  52ca5e2765b7a4532d26502b5b76b7c85c5019d7 (commit)
      from  583ba9b96ce3c3e52173cd847a0c00ff10c1cf85 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit ddb6ada4dbd0fa8db97ba6f2f4d2d8cb4149c8f1
Merge: 583ba9b 52ca5e2
Author: Johnathan Corgan <address@hidden>
Date:   Fri Dec 7 10:06:29 2012 -0800

    Merge branch 'master' into next
    
    Conflicts:
        gnuradio-core/src/lib/runtime/gr_basic_block.h

-----------------------------------------------------------------------

Summary of changes:
 CMakeLists.txt                                     |    7 +
 gnuradio-core/src/lib/io/CMakeLists.txt            |    4 +
 gnuradio-core/src/lib/io/gr_message_debug.cc       |   34 ++-
 gnuradio-core/src/lib/io/gr_message_debug.h        |    1 +
 gnuradio-core/src/lib/io/gr_pdu.cc                 |   70 ++--
 gnuradio-core/src/lib/io/gr_pdu.h                  |    1 +
 gnuradio-core/src/lib/io/gr_socket_pdu.cc          |  157 ++++++++
 gnuradio-core/src/lib/io/gr_socket_pdu.h           |  203 ++++++++++
 .../src/lib/io/{gr_pdu.i => gr_socket_pdu.i}       |   63 ++--
 gnuradio-core/src/lib/io/gr_stream_pdu_base.cc     |  117 ++++++
 .../io/{gr_message_sink.h => gr_stream_pdu_base.h} |   45 +--
 gnuradio-core/src/lib/io/gr_tuntap_pdu.cc          |  143 +++++++
 .../lib/io/{gr_message_sink.h => gr_tuntap_pdu.h}  |   47 ++-
 .../src/lib/io/gr_tuntap_pdu.i                     |   10 +-
 gnuradio-core/src/lib/io/io.i                      |    5 +
 gnuradio-core/src/lib/runtime/gr_basic_block.cc    |   41 +-
 gnuradio-core/src/lib/runtime/gr_basic_block.h     |  406 ++++++++++----------
 gnuradio-core/src/lib/runtime/gr_flat_flowgraph.cc |   34 ++-
 gnuradio-core/src/lib/runtime/gr_flat_flowgraph.h  |    4 +-
 gnuradio-core/src/lib/runtime/gr_flowgraph.cc      |   40 ++-
 gnuradio-core/src/lib/runtime/gr_flowgraph.h       |   61 +++-
 gnuradio-core/src/lib/runtime/gr_hier_block2.cc    |    5 +-
 gnuradio-core/src/lib/runtime/gr_hier_block2.h     |   33 ++
 gnuradio-core/src/lib/runtime/gr_hier_block2.i     |    6 +
 .../src/lib/runtime/gr_hier_block2_detail.cc       |   90 ++++-
 .../src/lib/runtime/gr_hier_block2_detail.h        |    1 +
 .../src/python/gnuradio/gr/hier_block2.py          |   13 +
 grc/blocks/block_tree.xml                          |    2 +
 grc/blocks/gr_message_debug.xml                    |    5 +
 grc/blocks/gr_socket_pdu.xml                       |   62 +++
 grc/blocks/gr_tuntap_pdu.xml                       |   34 ++
 grc/blocks/pad_sink.xml                            |    9 +-
 grc/blocks/pad_source.xml                          |    9 +-
 grc/python/FlowGraph.py                            |   10 +
 grc/python/convert_hier.py                         |   20 +-
 grc/python/flow_graph.tmpl                         |   17 +-
 gruel/src/include/gruel/pmt.h                      |    6 +
 gruel/src/lib/pmt/pmt.cc                           |   16 +
 gruel/src/swig/pmt_swig.i                          |    5 +
 volk/CMakeLists.txt                                |   10 +-
 volk/apps/CMakeLists.txt                           |    2 +-
 41 files changed, 1486 insertions(+), 362 deletions(-)
 create mode 100644 gnuradio-core/src/lib/io/gr_socket_pdu.cc
 create mode 100644 gnuradio-core/src/lib/io/gr_socket_pdu.h
 copy gnuradio-core/src/lib/io/{gr_pdu.i => gr_socket_pdu.i} (85%)
 create mode 100644 gnuradio-core/src/lib/io/gr_stream_pdu_base.cc
 copy gnuradio-core/src/lib/io/{gr_message_sink.h => gr_stream_pdu_base.h} (59%)
 create mode 100644 gnuradio-core/src/lib/io/gr_tuntap_pdu.cc
 copy gnuradio-core/src/lib/io/{gr_message_sink.h => gr_tuntap_pdu.h} (54%)
 copy gr-comedi/src/gri_comedi.cc => gnuradio-core/src/lib/io/gr_tuntap_pdu.i 
(89%)
 create mode 100644 grc/blocks/gr_socket_pdu.xml
 create mode 100644 grc/blocks/gr_tuntap_pdu.xml


hooks/post-receive
-- 
git://gnuradio.org/gnuradio



reply via email to

[Prev in Thread] Current Thread [Next in Thread]