commit-gnuradio
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Commit-gnuradio] git://gnuradio.org/jblum branch, wip_uhd, updated. 91e


From: git version control
Subject: [Commit-gnuradio] git://gnuradio.org/jblum branch, wip_uhd, updated. 91eada4733c930ff3636395e67ff4e3c336b903f
Date: Fri, 16 Mar 2012 22:37:30 +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/jblum".

The branch, wip_uhd has been updated
  discards  f7746a95c35bcf432e76aff2ae19230f1bcdfe12 (commit)
  discards  d274dedc0659bcd6fe2f48977e2fa6d553866881 (commit)
       via  91eada4733c930ff3636395e67ff4e3c336b903f (commit)
       via  c10e81b23f18880a31f3ffb184a9a248c2f961ab (commit)
       via  7e2d501a7b8cee26412605bc37cb3cc6f771bbc7 (commit)
       via  30adb8816974f1e4580ea5bb1ee27a9a12dbb78e (commit)
       via  74f7c070339a3bb4ba2b6f2e17c66583ba4c0104 (commit)
       via  9ebc20522bf1f7ab6e7e89301d5504912a315b32 (commit)
       via  dec5706be8e112e46b7447d3b85c4268d8c03819 (commit)
       via  f9a07338b9c7c0af19d64d24c47eaa9f7fe1ba38 (commit)
       via  efa8df3c9c5db9dccef96305e6b702602661793d (commit)
       via  62c6323bdb06d7d3f103d3a75265d45ae6ce00b4 (commit)
       via  83c6ee03ada6a44788421ebfe813b7d594fc8a7a (commit)
       via  00b373f8aaabe97092ba1697c18a8d0ef391e475 (commit)
       via  e0c2ea36f7f5ef9c4196199cd6504469a027ba58 (commit)
       via  00a3bd55cbb2247db1f48ac8d0d3ada7e2e8c098 (commit)
       via  4b1b276fdd0e98f25a3f357dab8453e17b1aa4cf (commit)

This update added new revisions after undoing existing revisions.  That is
to say, the old revision is not a strict subset of the new revision.  This
situation occurs when you --force push a change and generate a repository
containing something like this:

 * -- * -- B -- O -- O -- O (f7746a95c35bcf432e76aff2ae19230f1bcdfe12)
            \
             N -- N -- N (91eada4733c930ff3636395e67ff4e3c336b903f)

When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.

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 91eada4733c930ff3636395e67ff4e3c336b903f
Author: Josh Blum <address@hidden>
Date:   Fri Mar 16 15:38:11 2012 -0700

    uhd: added multi-finite-aquisition

commit c10e81b23f18880a31f3ffb184a9a248c2f961ab
Author: Josh Blum <address@hidden>
Date:   Fri Mar 16 15:37:44 2012 -0700

    uhd: fix device_addr init issue

commit 7e2d501a7b8cee26412605bc37cb3cc6f771bbc7
Merge: 74f7c07 30adb88
Author: Johnathan Corgan <address@hidden>
Date:   Fri Mar 16 14:33:30 2012 -0700

    Merge branch 'gr-uhd-set-user-register'

commit 30adb8816974f1e4580ea5bb1ee27a9a12dbb78e
Author: Johnathan Corgan <address@hidden>
Date:   Fri Mar 16 14:32:34 2012 -0700

    uhd: conditionalize set_user_register call on availability in UHD API

commit 74f7c070339a3bb4ba2b6f2e17c66583ba4c0104
Merge: 9ebc205 dec5706
Author: Tom Rondeau <address@hidden>
Date:   Fri Mar 16 16:56:42 2012 -0400

    Merge branch 'maint'

commit 9ebc20522bf1f7ab6e7e89301d5504912a315b32
Merge: b42436c f9a0733
Author: Tom Rondeau <address@hidden>
Date:   Fri Mar 16 16:56:00 2012 -0400

    Merge remote branch 'jblum/gruel_common_swig'

commit dec5706be8e112e46b7447d3b85c4268d8c03819
Merge: 0f2ea17 efa8df3
Author: Tom Rondeau <address@hidden>
Date:   Fri Mar 16 16:55:25 2012 -0400

    Merge remote branch 'jblum/minor_gruel_qa_fix' into maint

commit 62c6323bdb06d7d3f103d3a75265d45ae6ce00b4
Merge: 83c6ee0 8e01315
Author: Johnathan Corgan <address@hidden>
Date:   Tue Mar 13 17:38:12 2012 -0700

    Merge remote branch 'gnuradio/maint' into gr-uhd-set-user-register

commit 83c6ee03ada6a44788421ebfe813b7d594fc8a7a
Merge: 00b373f 2d80e59
Author: Johnathan Corgan <address@hidden>
Date:   Sat Jan 21 08:22:20 2012 -0800

    Merge remote branch 'gnuradio/maint' into gr-uhd-set-user-register

commit 00b373f8aaabe97092ba1697c18a8d0ef391e475
Merge: e0c2ea3 da8f675
Author: Johnathan Corgan <address@hidden>
Date:   Wed Jan 18 22:46:41 2012 -0800

    Merge branch 'maint' into gr-uhd-set-user-register

commit e0c2ea36f7f5ef9c4196199cd6504469a027ba58
Merge: 00a3bd5 9f41efc
Author: Johnathan Corgan <address@hidden>
Date:   Tue Jan 17 16:31:50 2012 -0800

    Merge branch 'maint' into gr-uhd-set-user-register

commit 00a3bd55cbb2247db1f48ac8d0d3ada7e2e8c098
Merge: 4b1b276 58aba98
Author: Johnathan Corgan <address@hidden>
Date:   Tue Jan 17 12:09:32 2012 -0800

    Merge branch 'maint' into gr-uhd-set-user-register

commit 4b1b276fdd0e98f25a3f357dab8453e17b1aa4cf
Author: Johnathan Corgan <address@hidden>
Date:   Tue Jan 10 10:21:43 2012 -0800

    uhd: add API call to set user registers

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

Summary of changes:
 gnuradio-core/src/lib/runtime/gr_msg_queue.i       |   14 +++---
 gnuradio-core/src/lib/swig/gnuradio.i              |   18 +------
 gr-uhd/include/gr_uhd_usrp_sink.h                  |    9 +++
 gr-uhd/include/gr_uhd_usrp_source.h                |    9 +++
 gr-uhd/lib/gr_uhd_usrp_sink.cc                     |    9 +++
 gr-uhd/lib/gr_uhd_usrp_source.cc                   |    8 +++
 gruel/src/python/CMakeLists.txt                    |    2 +-
 gruel/src/swig/CMakeLists.txt                      |    2 +-
 gruel/src/swig/Makefile.am                         |    1 +
 .../audio_swig.i => gruel/src/swig/gruel_common.i  |   52 +++++++++++++------
 gruel/src/swig/pmt_swig.i                          |   17 +------
 11 files changed, 83 insertions(+), 58 deletions(-)
 copy gr-audio/swig/audio_swig.i => gruel/src/swig/gruel_common.i (50%)


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



reply via email to

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