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, source_block_yields,


From: git version control
Subject: [Commit-gnuradio] git://gnuradio.org/jblum branch, source_block_yields, updated. c1a5501b8bbe7ef2f914065718127d43e980625d
Date: Sun, 30 Sep 2012 03:22:17 +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, source_block_yields has been updated
  discards  cd8beb8858ef1e47394aa452c1b8cfbdaef1e9b8 (commit)
  discards  2a34c5f10ccf4f704ff899039e301d5e9f79ca09 (commit)
  discards  d433d08264d909c8f0b826c8ff3ecfaa506b556b (commit)
       via  c1a5501b8bbe7ef2f914065718127d43e980625d (commit)
       via  f61bb9840172d2651711df7fd1e9d1bfea123a28 (commit)
       via  4bfabce9be2153631bea5f0854f33cbf0b2becec (commit)
       via  91d630638d6cbe237f0fa1a978f3161a9a041895 (commit)
       via  515d1b6f91f5dd28997525b1e88006bbfc0f170a (commit)
       via  a07fe1904412af78b3d70a6225e6efe10c9efbe5 (commit)
       via  ecc8f73c367fbd7fed43aae67dea67261e374a8b (commit)
       via  96f181f29afbae43fa449297a232637fadf426d0 (commit)
       via  08cf111f1d30ad08965c2892aeed5030d2cec1b2 (commit)
       via  f1ef7c182d22df3e757b7dc4fa2970fc8bf143de (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 (cd8beb8858ef1e47394aa452c1b8cfbdaef1e9b8)
            \
             N -- N -- N (c1a5501b8bbe7ef2f914065718127d43e980625d)

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 c1a5501b8bbe7ef2f914065718127d43e980625d
Author: Josh Blum <address@hidden>
Date:   Sat Sep 29 20:19:16 2012 -0700

    core: udp source wait mode yields work thread

commit f61bb9840172d2651711df7fd1e9d1bfea123a28
Author: Josh Blum <address@hidden>
Date:   Sat Sep 29 20:14:51 2012 -0700

    uhd: work does not block, OK to return 0 on ERROR_CODE_TIMEOUT

commit 4bfabce9be2153631bea5f0854f33cbf0b2becec
Author: Josh Blum <address@hidden>
Date:   Sat Sep 29 20:13:38 2012 -0700

    core: source block can yield thread context/produce none

commit 91d630638d6cbe237f0fa1a978f3161a9a041895
Merge: ecc8f73 515d1b6
Author: Johnathan Corgan <address@hidden>
Date:   Fri Sep 28 10:11:50 2012 -0700

    Merge branch 'master' into next

commit 515d1b6f91f5dd28997525b1e88006bbfc0f170a
Author: Tim O'Shea <address@hidden>
Date:   Wed Sep 26 14:18:30 2012 -0400

    added the ability to open custom GRC hier block definitions from graphs 
using an instance of them

commit a07fe1904412af78b3d70a6225e6efe10c9efbe5
Author: Tim O'Shea <address@hidden>
Date:   Tue Sep 25 11:40:10 2012 -0400

    adding GRC Reload Block XML action

commit ecc8f73c367fbd7fed43aae67dea67261e374a8b
Merge: 4200a7b 96f181f
Author: Johnathan Corgan <address@hidden>
Date:   Thu Sep 27 11:29:03 2012 -0400

    Merge branch 'master' into next

commit 96f181f29afbae43fa449297a232637fadf426d0
Merge: c85bd69 08cf111
Author: Johnathan Corgan <address@hidden>
Date:   Thu Sep 27 11:16:50 2012 -0400

    Merge branch 'maint'

commit 08cf111f1d30ad08965c2892aeed5030d2cec1b2
Author: Josh Blum <address@hidden>
Date:   Tue Aug 14 23:00:16 2012 -0700

    core: fix use of private vars in place of API accessor
    
    Conflicts:
    
        gnuradio-core/src/lib/io/gr_tagged_file_sink.cc

commit f1ef7c182d22df3e757b7dc4fa2970fc8bf143de
Author: Josh Blum <address@hidden>
Date:   Wed Sep 19 14:24:47 2012 -0400

    digital: fix private access in gr_endian_swap

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

Summary of changes:
 gnuradio-core/src/lib/general/gr_endian_swap.cc |    2 +-
 grc/base/Block.py                               |    1 +
 grc/base/Platform.py                            |    4 ++++
 grc/gui/ActionHandler.py                        |   12 ++++++++++++
 grc/gui/Actions.py                              |   10 ++++++++++
 grc/gui/Bars.py                                 |    3 +++
 grc/gui/BlockTreeWindow.py                      |    5 +++++
 grc/gui/FlowGraph.py                            |    1 +
 grc/gui/MainWindow.py                           |    5 ++++-
 grc/python/block.dtd                            |    3 ++-
 grc/python/convert_hier.py                      |    1 +
 11 files changed, 44 insertions(+), 3 deletions(-)


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



reply via email to

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