[Commit-gnuradio] [gnuradio] 18/37: 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 b0a72b4f06f9a21f0ba5d80fc27a0940fad66dbf
Merge: ded480e 45f12cf
Author: Tom Rondeau <address@hidden>
Date:   Fri Jul 11 16:01:12 2014 -0400

    Merge branch 'maint'

 gnuradio-runtime/include/gnuradio/rpcregisterhelpers.h |  8 +++++---
 gr-uhd/lib/CMakeLists.txt                              | 13 +++++++++++++
 2 files changed, 18 insertions(+), 3 deletions(-)