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.1-183-ge91ae54
Date: Sat, 24 Mar 2012 17:21:27 +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  e91ae54188e9812f3d8ed45e7f675e5a98ec889f (commit)
       via  87c8751c99cfb2191bea19557d158fdd952c56eb (commit)
       via  60e31043e2fc5e44d1376725addd485d183c7d1c (commit)
       via  f06bc44e150fbec00200ed98cf80cc384ec6dac2 (commit)
       via  0aeee7ffb7c7244c97766681a134db2d46ab6d43 (commit)
       via  38d0c4cff7aa26567c3fb2fb55002de8627aa044 (commit)
       via  90213d65782dbbc612494ed28568e23b42961488 (commit)
       via  a751e4884d918c079d07d3108f5561ac43c3553e (commit)
       via  7954c7dbfe5267cc3504598410b8ea73bef34fe5 (commit)
       via  708b7e46a9407710f9aab9444561d464fa56c9b9 (commit)
      from  7eebbcd5ed9f94904adf99967c928ec736779a4a (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 e91ae54188e9812f3d8ed45e7f675e5a98ec889f
Merge: 7eebbcd 87c8751
Author: Johnathan Corgan <address@hidden>
Date:   Sat Mar 24 10:19:49 2012 -0700

    Merge branch 'master' into next
    
    Conflicts:
        gr-uhd/lib/Makefile.am

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

Summary of changes:
 gr-uhd/include/gr_uhd_usrp_sink.h                  |   13 ++++
 gr-uhd/include/gr_uhd_usrp_source.h                |   29 ++++++++-
 gr-uhd/lib/CMakeLists.txt                          |    3 +-
 gr-uhd/lib/gr_uhd_amsg_source.cc                   |    4 +-
 .../gr_add_ff.h => gr-uhd/lib/gr_uhd_common.h      |   56 +++++++-----------
 gr-uhd/lib/gr_uhd_usrp_sink.cc                     |   28 ++++++++-
 gr-uhd/lib/gr_uhd_usrp_source.cc                   |   63 +++++++++++++++++--
 gr-uhd/swig/__init__.py                            |    4 +
 8 files changed, 150 insertions(+), 50 deletions(-)
 copy gnuradio-core/src/lib/general/gr_add_ff.h => gr-uhd/lib/gr_uhd_common.h 
(51%)


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



reply via email to

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