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.4-693-g6e988b7
Date: Wed, 27 Feb 2013 21:55:15 +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  6e988b777c6788cc7d434b869173ebcdcc2ce5e3 (commit)
       via  1a05c3283ea63262221679b5e65acfe9b4495768 (commit)
       via  c4edfc69a1e2e5b6800d00a2436fb3c8d5ef3233 (commit)
       via  25d8f8ddb3fe5493ef2847047c1e70283b0d8af1 (commit)
      from  7388cc248d523d55e74ebfd4e434cc9d82001949 (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 6e988b777c6788cc7d434b869173ebcdcc2ce5e3
Author: Johnathan Corgan <address@hidden>
Date:   Wed Feb 27 13:50:57 2013 -0800

    core: removed gr_tuntap_pdu
    
    Replaced by gr::blocks:tuntap_pdu

commit 1a05c3283ea63262221679b5e65acfe9b4495768
Merge: 7388cc2 c4edfc6
Author: Johnathan Corgan <address@hidden>
Date:   Wed Feb 27 13:33:00 2013 -0800

    Merge branch 'master' into next
    
    Conflicts:
        gnuradio-core/src/lib/io/gr_pdu_to_tagged_stream.cc
        gnuradio-core/src/lib/io/gr_tagged_stream_to_pdu.cc

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

Summary of changes:
 gnuradio-core/src/lib/io/CMakeLists.txt            |    1 -
 gnuradio-core/src/lib/io/gr_pdu.h                  |   13 +-
 .../src/lib/io/gr_pdu_to_tagged_stream.cc          |    8 +-
 .../src/lib/io/gr_tagged_stream_to_pdu.cc          |    8 +-
 gnuradio-core/src/lib/io/gr_tuntap_pdu.cc          |  145 --------------------
 gnuradio-core/src/lib/io/gr_tuntap_pdu.h           |   74 ----------
 gnuradio-core/src/lib/io/gr_tuntap_pdu.i           |   30 ----
 gnuradio-core/src/lib/io/io.i                      |    2 -
 gr-blocks/grc/blocks_block_tree.xml                |    4 +
 gr-blocks/grc/blocks_tuntap_pdu.xml                |   34 +++++
 gr-blocks/include/blocks/CMakeLists.txt            |    1 +
 .../include/blocks/{keep_m_in_n.h => tuntap_pdu.h} |   32 ++--
 gr-blocks/lib/CMakeLists.txt                       |    2 +
 gr-blocks/lib/ConfigChecks.cmake                   |    2 +-
 gr-blocks/lib/stream_pdu_base.cc                   |  126 +++++++++++++++++
 .../blocks/keep_m_in_n.h => lib/stream_pdu_base.h} |   49 ++++---
 gr-blocks/lib/tuntap_pdu_impl.cc                   |  139 +++++++++++++++++++
 gr-blocks/lib/{rms_cf_impl.h => tuntap_pdu_impl.h} |   36 ++---
 gr-blocks/swig/blocks_swig.i                       |    3 +
 grc/blocks/block_tree.xml                          |    1 -
 grc/blocks/gr_tuntap_pdu.xml                       |   34 -----
 21 files changed, 385 insertions(+), 359 deletions(-)
 delete mode 100644 gnuradio-core/src/lib/io/gr_tuntap_pdu.cc
 delete mode 100644 gnuradio-core/src/lib/io/gr_tuntap_pdu.h
 delete mode 100644 gnuradio-core/src/lib/io/gr_tuntap_pdu.i
 create mode 100644 gr-blocks/grc/blocks_tuntap_pdu.xml
 copy gr-blocks/include/blocks/{keep_m_in_n.h => tuntap_pdu.h} (60%)
 create mode 100644 gr-blocks/lib/stream_pdu_base.cc
 copy gr-blocks/{include/blocks/keep_m_in_n.h => lib/stream_pdu_base.h} (56%)
 create mode 100644 gr-blocks/lib/tuntap_pdu_impl.cc
 copy gr-blocks/lib/{rms_cf_impl.h => tuntap_pdu_impl.h} (59%)
 delete 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]