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. 3.6


From: git version control
Subject: [Commit-gnuradio] git://gnuradio.org/gnuradio branch, next, updated. 3.6.2git-185-g8810102
Date: Sat, 23 Jun 2012 13:47: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  881010202a5054c430d8e5a6f72c206c1cc350ae (commit)
       via  bf8700a226091c5ce0130a3819a4c12b9d9981a6 (commit)
       via  c94ddc5e0c08693c023c099bd8946ca6e143f471 (commit)
       via  81589710a52c0e1b087f28ac54e83b9cbfa477d1 (commit)
       via  5cf2674681b3fd68c528eaeac57edf1ec94bee71 (commit)
       via  92c374e217f90a874b34945c83a4552145c7c3eb (commit)
       via  a3867cd910fa4f3b2595c7f846b0e7f709f4697d (commit)
       via  93a4677fa127317910ec5868cc5e22a52d4d7240 (commit)
       via  31fc0ca9bb616d49f8d359054702f4625a535ea0 (commit)
       via  d511ba0468da7a1e3685eaeab9645847b4384ff4 (commit)
      from  c9e9b9fd54469aac9d2965796971988caba06522 (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 881010202a5054c430d8e5a6f72c206c1cc350ae
Merge: c9e9b9f bf8700a
Author: Tom Rondeau <address@hidden>
Date:   Sat Jun 23 09:44:14 2012 -0400

    Merge branch 'master' into next
    
    Conflicts:
        gnuradio-core/src/lib/general/CMakeLists.txt
        gnuradio-core/src/lib/general/general.i

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

Summary of changes:
 gnuradio-core/src/lib/general/CMakeLists.txt       |    1 +
 gnuradio-core/src/lib/general/general.i            |    2 +
 gnuradio-core/src/lib/general/gr_tag_debug.cc      |  100 ++++++++++++++++++++
 gnuradio-core/src/lib/general/gr_tag_debug.h       |   85 +++++++++++++++++
 .../lib/general/{gr_add_ff.i => gr_tag_debug.i}    |   13 ++-
 .../src/python/gnuradio/gr/qa_tag_debug.py         |   20 +++--
 gr-filter/include/filter/fir_filter_with_buffer.h  |    3 +
 gr-filter/lib/fir_filter_with_buffer.cc            |   75 ++++++++++-----
 gr-filter/lib/qa_fir_filter_with_buffer.cc         |   10 +-
 gr-filter/lib/qa_mmse_fir_interpolator_cc.cc       |    8 +-
 gr-filter/lib/qa_mmse_fir_interpolator_ff.cc       |   10 +-
 gr-filter/python/qa_pfb_channelizer.py             |    8 +-
 grc/blocks/block_tree.xml                          |    1 +
 grc/blocks/{gr_udp_sink.xml => gr_tag_debug.xml}   |   45 +++++----
 .../volk/volk_32fc_s32fc_x2_rotator_32fc_a.h       |    4 +-
 volk/include/volk/volk_32fc_x2_dot_prod_32fc_a.h   |   33 +------
 volk/lib/testqa.cc                                 |    4 +-
 17 files changed, 309 insertions(+), 113 deletions(-)
 create mode 100644 gnuradio-core/src/lib/general/gr_tag_debug.cc
 create mode 100644 gnuradio-core/src/lib/general/gr_tag_debug.h
 copy gnuradio-core/src/lib/general/{gr_add_ff.i => gr_tag_debug.i} (76%)
 copy gr-fcd/python/qa_fcd.py => 
gnuradio-core/src/python/gnuradio/gr/qa_tag_debug.py (66%)
 copy grc/blocks/{gr_udp_sink.xml => gr_tag_debug.xml} (69%)


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



reply via email to

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