[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 02/04: Merge branch 'maint'
From: |
git |
Subject: |
[Commit-gnuradio] [gnuradio] 02/04: Merge branch 'maint' |
Date: |
Wed, 14 Dec 2016 01:25:18 +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 bd18ea164242fc115cb43f4a1b52934a25afd61a
Merge: 302d51a 3edb853
Author: Martin Braun <address@hidden>
Date: Tue Dec 13 16:48:09 2016 -0800
Merge branch 'maint'
gr-uhd/lib/usrp_sink_impl.cc | 2 ++
gr-uhd/lib/usrp_source_impl.cc | 5 +++--
2 files changed, 5 insertions(+), 2 deletions(-)