[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: |
Thu, 16 Apr 2015 15:08:10 +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 33df8cb121330498e9e5d9d29fadd815ad797f2f
Merge: 527c21c fdfece1
Author: Johnathan Corgan <address@hidden>
Date: Thu Apr 16 08:03:58 2015 -0700
Merge branch 'master' into next
gnuradio-runtime/include/gnuradio/rpcbufferedget.h | 3 +-
.../include/gnuradio/rpcserver_booter_thrift.h | 3 +-
.../include/gnuradio/rpcserver_thrift.h | 3 +
.../include/gnuradio/thrift_application_base.h | 7 +-
.../include/gnuradio/thrift_server_template.h | 87 +++++++++----------
gnuradio-runtime/lib/controlport/thrift/README | 41 +++++++++
.../controlport/thrift/rpcserver_booter_thrift.cc | 14 ++--
.../lib/controlport/thrift/rpcserver_thrift.cc | 8 ++
.../thrift/thrift-codebase-shutdown-patch.diff | 98 ++++++++++++++++++++++
gr-uhd/lib/usrp_sink_impl.cc | 2 +-
10 files changed, 202 insertions(+), 64 deletions(-)