[Commit-gnuradio] [gnuradio] 05/07: Merge remote-tracking branch 'michaelld/fix_clang_warnings' into maint

[git]

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

jcorgan pushed a commit to branch maint
in repository gnuradio.

commit c6b03c3c49293ad45d3128df2cae119e48ed70ba
Merge: 2803328 95e8c6c
Author: Johnathan Corgan <address@hidden>
Date:   Mon Mar 31 10:20:36 2014 -0700

    Merge remote-tracking branch 'michaelld/fix_clang_warnings' into maint

 gnuradio-runtime/include/gnuradio/pycallback_object.h    | 3 +++
 gnuradio-runtime/include/gnuradio/rpcserver_aggregator.h | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)