commit-gnuradio
[Top][All Lists]
Advanced

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

[Commit-gnuradio] git://gnuradio.org/jcorgan branch, wip/gr-blocks-maste


From: git version control
Subject: [Commit-gnuradio] git://gnuradio.org/jcorgan branch, wip/gr-blocks-master, updated. 3.6.1git-325-gb434b73
Date: Thu, 30 Aug 2012 21:27:43 +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/jcorgan".

The branch, wip/gr-blocks-master has been updated
  discards  3f046c1d756d7e7b0e8d6a7ed1f4787058dddc0e (commit)
       via  b434b7329301fee49ab82a81ac68517f8ab042eb (commit)
       via  0a5bb996ca4f4bb350cf91b00b4c3db5a5c4eb75 (commit)

This update added new revisions after undoing existing revisions.  That is
to say, the old revision is not a strict subset of the new revision.  This
situation occurs when you --force push a change and generate a repository
containing something like this:

 * -- * -- B -- O -- O -- O (3f046c1d756d7e7b0e8d6a7ed1f4787058dddc0e)
            \
             N -- N -- N (b434b7329301fee49ab82a81ac68517f8ab042eb)

When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.

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 b434b7329301fee49ab82a81ac68517f8ab042eb
Author: Johnathan Corgan <address@hidden>
Date:   Thu Aug 30 14:29:28 2012 -0700

    blocks: added gr::blocks::stream_to_streams

commit 0a5bb996ca4f4bb350cf91b00b4c3db5a5c4eb75
Author: Johnathan Corgan <address@hidden>
Date:   Wed Aug 29 09:29:50 2012 -0700

    blocks: added gr::blocks::stream_mux

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

Summary of changes:
 gr-blocks/grc/blocks_block_tree.xml                |    2 +
 .../grc/blocks_stream_to_streams.xml               |    6 +-
 gr-blocks/include/blocks/CMakeLists.txt            |    1 +
 .../blocks/{deinterleave.h => stream_to_streams.h} |   20 +++++----
 gr-blocks/lib/CMakeLists.txt                       |    1 +
 ...nterleave_impl.cc => stream_to_streams_impl.cc} |   42 ++++++++-----------
 .../{and_XX_impl.h.t => stream_to_streams_impl.h}  |   16 +++-----
 .../gr => gr-blocks/python}/qa_pipe_fittings.py    |   31 ++++++--------
 gr-blocks/swig/blocks_swig.i                       |    3 +
 9 files changed, 58 insertions(+), 64 deletions(-)
 copy grc/blocks/gr_stream_to_streams.xml => 
gr-blocks/grc/blocks_stream_to_streams.xml (89%)
 copy gr-blocks/include/blocks/{deinterleave.h => stream_to_streams.h} (66%)
 copy gr-blocks/lib/{deinterleave_impl.cc => stream_to_streams_impl.cc} (60%)
 copy gr-blocks/lib/{and_XX_impl.h.t => stream_to_streams_impl.h} (77%)
 copy {gnuradio-core/src/python/gnuradio/gr => 
gr-blocks/python}/qa_pipe_fittings.py (90%)


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



reply via email to

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