[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 03/04: Merge remote-tracking branch 'fengzh
|
From: |
git |
|
Subject: |
[Commit-gnuradio] [gnuradio] 03/04: Merge remote-tracking branch 'fengzhe/packet_header_update' |
|
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 master
in repository gnuradio.
commit f20c56b7ff15655c56aede3a9d982a424c053778
Merge: 32d701e 492a0b4
Author: Johnathan Corgan <address@hidden>
Date: Thu Jan 22 15:07:23 2015 -0800
Merge remote-tracking branch 'fengzhe/packet_header_update'
gr-digital/grc/digital_packet_headergenerator_bb.xml | 1 +
gr-digital/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 ++
4 files changed, 12 insertions(+), 1 deletion(-)