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.1-1148-gfa98286
Date: Wed, 17 Apr 2013 22:17:13 +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  fa98286f6f80c203bf80c243a2774f6de7a4b5c8 (commit)
       via  066f711a0361c665b06689e8a9e8964617ea533c (commit)
      from  ae625607c22a0f4f775d70ac40e02ef3d5a04b35 (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 fa98286f6f80c203bf80c243a2774f6de7a4b5c8
Merge: ae62560 066f711
Author: Johnathan Corgan <address@hidden>
Date:   Tue Apr 16 19:39:24 2013 -0700

    Merge branch 'master' into next
    
    Conflicts:
        gnuradio-runtime/lib/gr_block_detail.cc

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

Summary of changes:
 gnuradio-runtime/include/gr_block_detail.h |   14 ++++++++++----
 gnuradio-runtime/include/gr_buffer.h       |    9 +++++++--
 gnuradio-runtime/include/gr_tags.h         |    3 +++
 gnuradio-runtime/lib/gr_block.cc           |    6 +++---
 gnuradio-runtime/lib/gr_block_detail.cc    |   14 ++++++++------
 gnuradio-runtime/lib/gr_block_executor.cc  |    8 ++++----
 gnuradio-runtime/lib/gr_buffer.cc          |   15 ++++++++++-----
 7 files changed, 45 insertions(+), 24 deletions(-)


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



reply via email to

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