[Commit-gnuradio] [gnuradio] 06/07: Merge remote-tracking branch 'gnieboer/gnieboer-patch-17-winaudio-sink-block'

[git]

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

jcorgan pushed a commit to branch master
in repository gnuradio.

commit 1c584bff478c0699658ef8435aeef127468dbf40
Merge: fea4a5c 4edbf58
Author: Johnathan Corgan <address@hidden>
Date:   Thu Oct 13 14:42:11 2016 -0700

    Merge remote-tracking branch 
'gnieboer/gnieboer-patch-17-winaudio-sink-block'

 gr-audio/lib/windows/windows_sink.cc | 22 ++++++++++++++++------
 gr-audio/lib/windows/windows_sink.h  | 14 ++++++++------
 2 files changed, 24 insertions(+), 12 deletions(-)