[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 01/01: Merge branch 'master' into next
|
From: |
git |
|
Subject: |
[Commit-gnuradio] [gnuradio] 01/01: Merge branch 'master' into next |
|
Date: |
Thu, 22 Jan 2015 23:38:45 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
jcorgan pushed a commit to branch next
in repository gnuradio.
commit 4b15e09bee3901c3d60d0e39b998e4e80c3404c6
Merge: 5dfeb2e 620817e
Author: Johnathan Corgan <address@hidden>
Date: Thu Jan 22 15:35:26 2015 -0800
Merge branch 'master' into next
gr-blocks/grc/blocks_repack_bits_bb.xml | 2 +-
gr-blocks/include/gnuradio/blocks/repack_bits_bb.h | 1 +
gr-blocks/lib/repack_bits_bb_impl.cc | 10 ++++++++++
gr-blocks/lib/repack_bits_bb_impl.h | 6 +++---
gr-digital/grc/digital_packet_headergenerator_bb.xml | 1 +
.../include/gnuradio/digital/packet_headergenerator_bb.h | 2 ++
gr-digital/lib/packet_headergenerator_bb_impl.cc | 8 +++++++-
gr-digital/lib/packet_headergenerator_bb_impl.h | 2 ++
8 files changed, 27 insertions(+), 5 deletions(-)