[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 02/02: Merge remote-tracking branch 'gnurad
|
From: |
git |
|
Subject: |
[Commit-gnuradio] [gnuradio] 02/02: Merge remote-tracking branch 'gnuradio-github/pr/1190' |
|
Date: |
Tue, 21 Mar 2017 04:36:18 +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 5b400f1a6634dc4a2e220fc6a3944214d737bc4c
Merge: f7b7e75 aabe4f8
Author: Johnathan Corgan <address@hidden>
Date: Mon Mar 20 21:08:59 2017 -0700
Merge remote-tracking branch 'gnuradio-github/pr/1190'
gr-digital/grc/variable_header_format_default.xml | 13 ++++--
.../gnuradio/digital/header_format_counter.h | 1 -
.../gnuradio/digital/header_format_default.h | 10 ++++-
gr-digital/lib/header_format_counter.cc | 3 +-
gr-digital/lib/header_format_default.cc | 10 ++---
gr-digital/python/digital/qa_packet_format.py | 47 +++++++++++++++++++++-
6 files changed, 70 insertions(+), 14 deletions(-)