[Commit-gnuradio] [gnuradio] 01/01: Merge branch 'next' into python3

[git]

This is an automated email from the git hooks/post-receive script.

jcorgan pushed a commit to branch python3
in repository gnuradio.

commit 0f382320fada6608b18af5ba1d961af0066c0d25
Merge: ea6d423 6c75cec
Author: Johnathan Corgan <address@hidden>
Date:   Mon Mar 20 21:29:03 2017 -0700

    Merge branch 'next' into python3
    
    Conflicts:
        gr-digital/python/digital/qa_packet_format.py

 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      | 50 ++++++++++++++++++++--
 6 files changed, 70 insertions(+), 17 deletions(-)

diff --cc gr-digital/python/digital/qa_packet_format.py
index 5a71369,ae1a79f..6b2e9e9
--- a/gr-digital/python/digital/qa_packet_format.py
+++ b/gr-digital/python/digital/qa_packet_format.py
@@@ -20,12 -20,7 +20,9 @@@
  # Boston, MA 02110-1301, USA.
  #
  
- 
- import time
- import struct
- 
+ import time, struct
 +import six
 +
  import pmt
  from gnuradio import gr, gr_unittest, digital, blocks
  from gnuradio.digital import packet_utils