[Commit-gnuradio] [gnuradio] 03/03: Merge remote-tracking branch 'ncorgan/win/master_fixes'

[git]

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

jcorgan pushed a commit to branch master
in repository gnuradio.

commit e981cd8fd12d1f8cf2a06828702c12b1bafff2c7
Merge: 9fd0f06 b5006c1
Author: Johnathan Corgan <address@hidden>
Date:   Tue Jul 8 13:55:34 2014 -0700

    Merge remote-tracking branch 'ncorgan/win/master_fixes'

 gr-fec/lib/ber_tools.cc                      | 11 +++++++++++
 gr-qtgui/lib/ber_sink_b_impl.cc              |  4 ++--
 volk/kernels/volk/volk_8u_x4_conv_k7_r2_8u.h |  4 ++++
 3 files changed, 17 insertions(+), 2 deletions(-)