[Commit-gnuradio] [gnuradio] 04/07: Merge branch 'maint'

[git]

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

trondeau pushed a commit to branch master
in repository gnuradio.

commit d9def5b1aaff73756d052027448a520e13a3274c
Merge: fd0db71 2d76452
Author: Tom Rondeau <address@hidden>
Date:   Sun Jul 27 12:50:04 2014 -0400

    Merge branch 'maint'

 gr-digital/lib/hdlc_deframer_bp_impl.cc         | 24 +++++++++---------------
 gr-digital/lib/hdlc_deframer_bp_impl.h          |  1 -
 volk/kernels/volk/volk_8u_conv_k7_r2puppet_8u.h |  1 +
 3 files changed, 10 insertions(+), 16 deletions(-)