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.5.2-103-gc732888
Date: Tue, 13 Mar 2012 16:11:19 +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  c7328884281802be7fd973fe8150cabe72f81cf9 (commit)
       via  0d6871b3aaa175ed20061543ded6d9f8b4dcbc61 (commit)
       via  c50cdd6e1f8d4555728b23af9a60f5ec8590ca75 (commit)
       via  b872e23b66b70784c38ecb78f606420c459e36db (commit)
       via  41c94e0a107adc1f5b2bf8262cad86df0d04c052 (commit)
       via  0cbaf1b350c5ef6fc25f429430f1c892e7844e01 (commit)
      from  2d54dd698f1ec9574e54e6a31bc7356abdd3e4ec (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 c7328884281802be7fd973fe8150cabe72f81cf9
Merge: 2d54dd6 0d6871b
Author: Tom Rondeau <address@hidden>
Date:   Tue Mar 13 12:00:38 2012 -0400

    Merge branch 'master' into next
    
    Conflicts:
        gnuradio-core/src/lib/general/Makefile.am
        gnuradio-core/src/lib/gengen/.gitignore
        gnuradio-core/src/lib/gengen/Makefile.am
        gnuradio-core/src/python/gnuradio/gr/Makefile.am

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

Summary of changes:
 gnuradio-core/src/lib/general/CMakeLists.txt       |    1 -
 gnuradio-core/src/lib/general/general.i            |    2 -
 gnuradio-core/src/lib/general/general_generated.i  |   20 ++++++++
 gnuradio-core/src/lib/general/gr_probe_signal_f.i  |   32 -------------
 gnuradio-core/src/lib/gengen/CMakeLists.txt        |    2 +
 gnuradio-core/src/lib/gengen/Makefile.gen          |   30 ++++++++++++
 gnuradio-core/src/lib/gengen/generate_common.py    |    6 ++-
 gnuradio-core/src/lib/gengen/gr_noise_source_X.h.t |   22 ++++++++-
 gnuradio-core/src/lib/gengen/gr_noise_source_X.i.t |    4 +-
 .../gr_probe_signal_X.cc.t}                        |   23 +++++-----
 .../gr_probe_signal_X.h.t}                         |   30 ++++++------
 ...ample_and_hold_XX.i.t => gr_probe_signal_X.i.t} |   13 +++---
 .../gr_probe_signal_vX.cc.t}                       |   31 ++++++-------
 .../gr_probe_signal_vX.h.t}                        |   34 ++++++++------
 ...{gr_integrate_XX.i.t => gr_probe_signal_vX.i.t} |   13 +++---
 .../{qa_float_to_uchar.py => qa_probe_signal.py}   |   47 ++++++++++---------
 grc/blocks/gr_noise_source_x.xml                   |    2 +-
 17 files changed, 176 insertions(+), 136 deletions(-)
 delete mode 100644 gnuradio-core/src/lib/general/gr_probe_signal_f.i
 copy gnuradio-core/src/lib/{general/gr_probe_signal_f.cc => 
gengen/gr_probe_signal_X.cc.t} (70%)
 copy gnuradio-core/src/lib/{general/gr_probe_signal_f.h => 
gengen/gr_probe_signal_X.h.t} (65%)
 copy gnuradio-core/src/lib/gengen/{gr_sample_and_hold_XX.i.t => 
gr_probe_signal_X.i.t} (83%)
 rename gnuradio-core/src/lib/{general/gr_probe_signal_f.cc => 
gengen/gr_probe_signal_vX.cc.t} (65%)
 rename gnuradio-core/src/lib/{general/gr_probe_signal_f.h => 
gengen/gr_probe_signal_vX.h.t} (65%)
 copy gnuradio-core/src/lib/gengen/{gr_integrate_XX.i.t => 
gr_probe_signal_vX.i.t} (82%)
 copy gnuradio-core/src/python/gnuradio/gr/{qa_float_to_uchar.py => 
qa_probe_signal.py} (54%)
 mode change 100755 => 100644


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



reply via email to

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