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-223-gb5e649c
Date: Sun, 8 Jul 2012 22:36:35 +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  b5e649cc9c781986ebca70c0117abf3f9ebdb11c (commit)
       via  e1cfa5eeeaebce6720dd98001c83b84218ae4d80 (commit)
       via  504a14dc0f24e165d0704ca2c0321598ae86f02e (commit)
       via  c4805e3a02b7547823c81664dae497c145c8c66a (commit)
       via  6c687bb86b6808822c6bb56e32645f0b2648a402 (commit)
       via  b34c497a27448cdadeecbf24bc95e8af5e4208c1 (commit)
       via  71127c2d4082119ea086f9f881b349922ed8cf24 (commit)
       via  8a82bd5dc56a914dd65b88e63b056711fe28cec0 (commit)
       via  61dd97409abde2412595fa762c0c4161863604f4 (commit)
       via  7c0f5550d06e9c5e2ab413e3e2b95a843a435135 (commit)
      from  8513c8d741f8702462bab1ac5a5ba565793dee54 (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 b5e649cc9c781986ebca70c0117abf3f9ebdb11c
Merge: 8513c8d e1cfa5e
Author: Tom Rondeau <address@hidden>
Date:   Sun Jul 8 18:28:31 2012 -0400

    Merge branch 'master' into next
    
    Conflicts:
        gr-digital/grc/digital_dxpsk_demod.xml

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

Summary of changes:
 gr-digital/examples/CMakeLists.txt                 |    1 +
 gr-digital/examples/demod/ber_simulation.grc       |  305 +++---
 gr-digital/examples/demod/digital_freq_lock.grc    |  820 ++++----------
 gr-digital/examples/demod/dpsk_loopback.grc        |  198 ++--
 .../{ber_simulation.grc => gfsk_loopback.grc}      |  501 ++++----
 gr-digital/examples/demod/mpsk_demod.grc           |   10 +-
 gr-digital/examples/demod/pam_sync.grc             | 1229 ++++++++------------
 gr-digital/examples/demod/pam_timing.grc           |  370 ++++---
 gr-digital/grc/digital_dxpsk_mod.xml               |    1 -
 ...gital_gmsk_demod.xml => digital_gfsk_demod.xml} |   15 +-
 .../{digital_gmsk_mod.xml => digital_gfsk_mod.xml} |   15 +-
 gr-digital/include/digital_fll_band_edge_cc.h      |   40 +-
 gr-digital/lib/digital_fll_band_edge_cc.cc         |   70 +-
 gr-digital/python/CMakeLists.txt                   |    1 +
 gr-digital/python/__init__.py                      |    1 +
 gr-digital/python/{gmsk.py => gfsk.py}             |   56 +-
 gr-filter/lib/pfb_channelizer_ccf_impl.cc          |    3 +-
 gr-filter/lib/pfb_synthesizer_ccf_impl.cc          |    3 +-
 gr-filter/lib/qa_fir_filter_with_buffer.cc         |    2 +-
 volk/include/volk/volk_32f_x2_dot_prod_32f_u.h     |   51 +-
 volk/lib/testqa.cc                                 |    2 +-
 21 files changed, 1522 insertions(+), 2172 deletions(-)
 copy gr-digital/examples/demod/{ber_simulation.grc => gfsk_loopback.grc} (68%)
 copy gr-digital/grc/{digital_gmsk_demod.xml => digital_gfsk_demod.xml} (87%)
 copy gr-digital/grc/{digital_gmsk_mod.xml => digital_gfsk_mod.xml} (84%)
 copy gr-digital/python/{gmsk.py => gfsk.py} (88%)


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



reply via email to

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