[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 01/01: Merge branch 'master' into next
From: |
git |
Subject: |
[Commit-gnuradio] [gnuradio] 01/01: Merge branch 'master' into next |
Date: |
Mon, 17 Apr 2017 21:19:25 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
jcorgan pushed a commit to branch next
in repository gnuradio.
commit cf0d54dcff7af305fb0ca7993dfc74064d3e7e47
Merge: cdeaea7 2d8f1d0
Author: Johnathan Corgan <address@hidden>
Date: Mon Apr 17 14:08:50 2017 -0700
Merge branch 'master' into next
gr-audio/lib/osx/osx_impl.cc | 2 +-
gr-uhd/apps/uhd_app.py | 37 +++++++++++++++++++++----------------
2 files changed, 22 insertions(+), 17 deletions(-)