[Commit-gnuradio] [gnuradio] 09/12: Merge remote-tracking branch 'softerhardware/master'

[git]

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

jcorgan pushed a commit to branch master
in repository gnuradio.

commit 850ec1fc602ace28269e36f8a5e091e2966c8268
Merge: f7f28bb 95a88be
Author: Johnathan Corgan <address@hidden>
Date:   Thu Jan 16 12:30:32 2014 -0800

    Merge remote-tracking branch 'softerhardware/master'

 gr-audio/lib/jack/jack_sink.cc   | 111 +++++++++++++++++++++++---------------
 gr-audio/lib/jack/jack_sink.h    |   6 ++-
 gr-audio/lib/jack/jack_source.cc | 112 ++++++++++++++++++++++++---------------
 gr-audio/lib/jack/jack_source.h  |   6 ++-
 4 files changed, 145 insertions(+), 90 deletions(-)