[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 02/03: Merge branch 'master' into next
|
From: |
git |
|
Subject: |
[Commit-gnuradio] [gnuradio] 02/03: Merge branch 'master' into next |
|
Date: |
Wed, 14 Dec 2016 00:35:45 +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 c9dc222c77dd0e1ce4a9cb8280b41e356ba4b84f
Merge: eeb34f8 302d51a
Author: Johnathan Corgan <address@hidden>
Date: Tue Dec 13 16:23:20 2016 -0800
Merge branch 'master' into next
cmake/Modules/GrBoost.cmake | 19 +++++++++++++++++--
gr-uhd/doc/uhd.dox | 8 ++++----
gr-uhd/lib/usrp_sink_impl.cc | 8 ++++++++
gr-uhd/lib/usrp_source_impl.cc | 8 ++++++++
4 files changed, 37 insertions(+), 6 deletions(-)