[Commit-gnuradio] [gnuradio] 01/01: Merge branch 'master' into next

[git]

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

trondeau pushed a commit to branch next
in repository gnuradio.

commit 7cf22104d57edfd6031d333558ffb86d63cc0083
Merge: dda779b a399894
Author: Tom Rondeau <address@hidden>
Date:   Mon Apr 21 11:00:47 2014 -0400

    Merge branch 'master' into next

 cmake/Modules/FindICE-3.5.cmake                    |  36 +-
 cmake/Toolchains/oe-sdk_cross.cmake                |   2 +-
 gnuradio-runtime/include/gnuradio/basic_block.h    |  64 +-
 .../include/gnuradio/rpccallbackregister_base.h    |  16 +-
 .../include/gnuradio/rpcregisterhelpers.h          | 756 ++++++++++++++++++---
 gnuradio-runtime/lib/block.cc                      |   6 +
 .../lib/controlport/rpcpmtconverters_ice.cc        |  17 +-
 gnuradio-runtime/lib/top_block.cc                  |  16 +
 .../python/gnuradio/ctrlport/gr-perf-monitorx      |  87 ++-
 gnuradio-runtime/python/gnuradio/ctrlport/icon.png | Bin 1532 -> 4377 bytes
 gr-digital/lib/pfb_clock_sync_ccf_impl.cc          |   7 +-
 gr-digital/lib/pfb_clock_sync_fff_impl.cc          |   5 +-
 12 files changed, 839 insertions(+), 173 deletions(-)