[Commit-gnuradio] [gnuradio] 11/14: Merge remote-tracking branch 'trondeau/controlport/cleaning_up'

[git]

This is an automated email from the git hooks/post-receive script.

trondeau pushed a commit to branch master
in repository gnuradio.

commit 39b8c223887ccd9c33695a916b416e9442fcbb93
Merge: be49144 08932c2
Author: Tom Rondeau <address@hidden>
Date:   Wed May 6 11:49:59 2015 -0400

    Merge remote-tracking branch 'trondeau/controlport/cleaning_up'

 .../include/gnuradio/rpcpmtconverters_thrift.h     |  1 +
 .../include/gnuradio/thrift_application_base.h     |  6 +-
 .../include/gnuradio/thrift_server_template.h      | 64 ++++++++++++----------
 gnuradio-runtime/lib/CMakeLists.txt                | 29 +++++-----
 .../controlport/thrift/rpcpmtconverters_thrift.cc  |  2 +-
 .../controlport/thrift/rpcserver_booter_thrift.cc  |  2 +-
 gr-blocks/lib/CMakeLists.txt                       | 22 ++++----
 7 files changed, 68 insertions(+), 58 deletions(-)