[Commit-gnuradio] git://gnuradio.org/gnuradio branch, master, updated. 3.6.1git-120-g1dcdd0a

[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/gnuradio".

The branch, master has been updated
       via  1dcdd0abe1e8c493a5d145ab9feb2006e6bdbb3e (commit)
       via  3e4f9b9fbf26eee0da87ebdd230df4aae232837f (commit)
       via  c8c5158133fb7a20413e42f59632930758561ad9 (commit)
      from  0b8a592583845b4989be454083f415488319f367 (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 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

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

Summary of changes:
 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_pack_k_bits_bb.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 +++++++---
 grc/blocks/gr_keep_m_in_n.xml                      |    6 ++-
 6 files changed, 119 insertions(+), 32 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/gnuradio