[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 04/04: Merge remote-tracking branch 'gnurad
|
From: |
git |
|
Subject: |
[Commit-gnuradio] [gnuradio] 04/04: Merge remote-tracking branch 'gnuradio-github/pr/1282' into next |
|
Date: |
Tue, 18 Apr 2017 00:20:32 +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 385f0d4b0a5074bc62bacd6366c4b7474db8ef40
Merge: c3a1e3d 834c944
Author: Johnathan Corgan <address@hidden>
Date: Mon Apr 17 17:10:38 2017 -0700
Merge remote-tracking branch 'gnuradio-github/pr/1282' into next
gnuradio-runtime/include/gnuradio/rpcmanager.h | 4 ++--
gnuradio-runtime/lib/controlport/rpcserver_selector.cc | 4 ++--
gnuradio-runtime/lib/thread/thread_group.cc | 2 +-
gr-blocks/lib/tcp_server_sink_impl.h | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)