[Commit-gnuradio] [gnuradio] 10/14: Merge branch 'hdlc_update'

[git]

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

jcorgan pushed a commit to branch master
in repository gnuradio.

commit 6c767fe8079355f2d40cfb2e8499581afcad8bd2
Merge: 66c609e 5cd1953
Author: Johnathan Corgan <address@hidden>
Date:   Fri May 9 13:52:54 2014 -0700

    Merge branch 'hdlc_update'

 gr-digital/grc/digital_hdlc_deframer_bp.xml        |   7 +-
 .../include/gnuradio/digital/hdlc_deframer_bp.h    |  11 +-
 .../include/gnuradio/digital/hdlc_framer_pb.h      |   2 +-
 gr-digital/lib/hdlc_deframer_bp_impl.cc            | 132 +++++++++------------
 gr-digital/lib/hdlc_deframer_bp_impl.h             |  16 ++-
 gr-digital/python/digital/qa_hdlc_framer.py        |   5 +-
 6 files changed, 73 insertions(+), 100 deletions(-)