[Commit-gnuradio] [gnuradio] 06/07: Merge branch 'maint'

[git]

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

trondeau pushed a commit to branch master
in repository gnuradio.

commit 830d0eff61ae2d5895cfa73a50a31e73da76411a
Merge: 9a72225 0ae33fc
Author: Tom Rondeau <address@hidden>
Date:   Sun Jun 29 22:02:09 2014 -0400

    Merge branch 'maint'

 gnuradio-runtime/include/gnuradio/logger.h.in | 86 +++++++++++++++++++++++++++
 gnuradio-runtime/lib/block.cc                 | 12 ++--
 gnuradio-runtime/lib/logger.cc                | 15 +++++
 gnuradio-runtime/lib/tpb_thread_body.cc       | 40 ++++++-------
 4 files changed, 127 insertions(+), 26 deletions(-)