[Commit-gnuradio] git://gnuradio.org/jcorgan branch, wip/gr-blocks-master, updated. 3.6.1git-126-g926f7cb

[git version control]

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/jcorgan".

The branch, wip/gr-blocks-master has been updated
       via  926f7cba99c4fa3906853e11ff4e91eea93a5a53 (commit)
       via  92ce6ff434763c8c9360c23435e715e19681b346 (commit)
       via  1dcdd0abe1e8c493a5d145ab9feb2006e6bdbb3e (commit)
       via  3e4f9b9fbf26eee0da87ebdd230df4aae232837f (commit)
       via  c8c5158133fb7a20413e42f59632930758561ad9 (commit)
       via  0b8a592583845b4989be454083f415488319f367 (commit)
       via  ec30d89449f48fdd2f88420b4c87aba2e1a5abd1 (commit)
       via  06b863305c718a4734cdf6d6b9ed5365b0b34728 (commit)
       via  fc22309289b88dfd7dd0b63aa1cd9557de3accb6 (commit)
      from  6260c4263231718c81770916c2574f8d395d10d6 (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 926f7cba99c4fa3906853e11ff4e91eea93a5a53
Merge: 6260c42 92ce6ff
Author: Johnathan Corgan <address@hidden>
Date:   Mon Jun 11 09:47:47 2012 -0700

    Merge commit 'v3.6.1' into wip/gr-blocks-master

commit 92ce6ff434763c8c9360c23435e715e19681b346
Author: Johnathan Corgan <address@hidden>
Date:   Mon Jun 11 08:36:37 2012 -0700

    cmake: update revision to 3.6.1 release

commit 1dcdd0abe1e8c493a5d145ab9feb2006e6bdbb3e
Merge: 0b8a592 3e4f9b9
Author: Tom Rondeau <address@hidden>
Date:   Sun Jun 10 22:55:46 2012 -0400

    Merge branch 'master-mods'

commit 3e4f9b9fbf26eee0da87ebdd230df4aae232837f
Merge: 9dc1901 c8c5158
Author: Tom Rondeau <address@hidden>
Date:   Sun Jun 10 22:54:40 2012 -0400

    Merge branch 'master-mods' of git://github.com/osh/gnuradio-1 into 
master-mods

commit c8c5158133fb7a20413e42f59632930758561ad9
Author: Tim O'Shea <address@hidden>
Date:   Sun Jun 10 13:54:09 2012 -0400

    gr_unpack_k_bits:
        added python QA code
        reversed bit ordering to match gr_pack_k_bits
    
    gr_keep_m_in_n:
        added python QA code
        switched block to operate on individual items as itemsize instead of 
vectors
        updated GRC to match

commit 0b8a592583845b4989be454083f415488319f367
Merge: 06b8633 ec30d89
Author: Tom Rondeau <address@hidden>
Date:   Sun Jun 10 12:53:14 2012 -0400

    Merge branch 'maint'

commit ec30d89449f48fdd2f88420b4c87aba2e1a5abd1
Author: Tom Rondeau <address@hidden>
Date:   Sun Jun 10 12:43:06 2012 -0400

    volk: make sure the alignment call for a block passes at least 1.
    
    For machines with an alignment of 1, the blocks were truncating the 
aligment to 0. This makes sure that it gets set to a minimum of 1.

commit 06b863305c718a4734cdf6d6b9ed5365b0b34728
Merge: 9038efc fc22309
Author: Johnathan Corgan <address@hidden>
Date:   Sat Jun 9 09:10:51 2012 -0700

    Merge branch 'maint'

commit fc22309289b88dfd7dd0b63aa1cd9557de3accb6
Author: Alexandru Csete <address@hidden>
Date:   Sat Jun 9 09:10:39 2012 -0700

    fcd: fix frequency offset test in GRC

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

Summary of changes:
 CMakeLists.txt                                     |    2 +-
 docs/doxygen/other/volk_guide.dox                  |    2 +-
 gnuradio-core/src/lib/general/gr_add_ff.cc         |    2 +-
 gnuradio-core/src/lib/general/gr_char_to_float.cc  |    2 +-
 gnuradio-core/src/lib/general/gr_char_to_short.cc  |    2 +-
 gnuradio-core/src/lib/general/gr_complex_to_xxx.cc |   12 ++--
 gnuradio-core/src/lib/general/gr_conjugate_cc.cc   |    2 +-
 gnuradio-core/src/lib/general/gr_float_to_char.cc  |    2 +-
 gnuradio-core/src/lib/general/gr_float_to_int.cc   |    2 +-
 gnuradio-core/src/lib/general/gr_float_to_short.cc |    2 +-
 gnuradio-core/src/lib/general/gr_int_to_float.cc   |    2 +-
 gnuradio-core/src/lib/general/gr_keep_m_in_n.cc    |   46 ++++++++++------
 gnuradio-core/src/lib/general/gr_keep_m_in_n.h     |   11 +++-
 gnuradio-core/src/lib/general/gr_multiply_cc.cc    |    6 +-
 .../src/lib/general/gr_multiply_conjugate_cc.cc    |    6 +-
 .../src/lib/general/gr_multiply_const_cc.cc        |    6 +-
 .../src/lib/general/gr_multiply_const_ff.cc        |    6 +-
 gnuradio-core/src/lib/general/gr_multiply_ff.cc    |    2 +-
 gnuradio-core/src/lib/general/gr_pack_k_bits_bb.cc |    2 +-
 gnuradio-core/src/lib/general/gr_short_to_char.cc  |    2 +-
 gnuradio-core/src/lib/general/gr_short_to_float.cc |    2 +-
 .../src/python/gnuradio/gr/qa_keep_m_in_n.py       |   58 ++++++++++++++++++++
 .../gr/{qa_unpack_k_bits.py => qa_pack_k_bits.py}  |   28 +++++++---
 gr-fcd/grc/fcd_source_c.xml                        |    2 +-
 grc/blocks/gr_keep_m_in_n.xml                      |    6 ++-
 25 files changed, 151 insertions(+), 64 deletions(-)
 create mode 100755 gnuradio-core/src/python/gnuradio/gr/qa_keep_m_in_n.py
 copy gnuradio-core/src/python/gnuradio/gr/{qa_unpack_k_bits.py => 
qa_pack_k_bits.py} (63%)


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