[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 aa98220e51be7c3cfb3738b8f82d4154f96e86ed
Merge: 451669c 19d111e
Author: Tom Rondeau <address@hidden>
Date:   Tue Jan 28 19:04:11 2014 -0500

    Merge branch 'master' into next

 cmake/Modules/FindICE.cmake                        |   4 +-
 gr-uhd/apps/uhd_rx_cfile                           |  35 +-
 volk/spu_lib/gc_spu_macs.h                         | 380 ---------------------
 volk/spu_lib/spu_16s_cmpgt_unaligned.c             | 160 ---------
 volk/spu_lib/spu_16s_vector_subtract_unaligned.c   | 178 ----------
 volk/spu_lib/spu_16s_vector_sum_unaligned.c        | 178 ----------
 .../spu_32fc_pointwise_multiply_unaligned.c        | 222 ------------
 volk/spu_lib/spu_memcpy_unaligned.c                | 290 ----------------
 volk/spu_lib/spu_memset_unaligned.S                | 185 ----------
 volk/tmpl/volk.tmpl.c                              |  48 +--
 10 files changed, 59 insertions(+), 1621 deletions(-)