[Commit-gnuradio] [gnuradio] 03/03: 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 f2b71d302cd30ff272ad7aec78388bdd44e8163c
Merge: b9cce7a 4c86654
Author: Tom Rondeau <address@hidden>
Date:   Mon Feb 24 17:51:36 2014 -0500

    Merge branch 'maint'
    
    Conflicts:
        gr-qtgui/lib/waterfall_sink_c_impl.cc
        gr-qtgui/lib/waterfall_sink_f_impl.cc
    
    Conflict due to white space issues.

 gr-qtgui/lib/waterfall_sink_c_impl.cc | 8 ++++----
 gr-qtgui/lib/waterfall_sink_f_impl.cc | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --cc gr-qtgui/lib/waterfall_sink_c_impl.cc
index 3727c01,e3ac3cc..54e4c95
--- a/gr-qtgui/lib/waterfall_sink_c_impl.cc
+++ b/gr-qtgui/lib/waterfall_sink_c_impl.cc
@@@ -332,9 -330,9 +333,8 @@@ namespace gr 
  
        d_fft->execute();     // compute the fft
  
-       volk_32fc_s32f_x2_power_spectral_density_32f_a(data_out, 
d_fft->get_outbuf(),
-                                                     size, 1.0, size);
- 
+       volk_32fc_s32f_x2_power_spectral_density_32f(data_out, 
d_fft->get_outbuf(),
+                                                    size, 1.0, size);
 -
        // Perform shift operation
        unsigned int len = (unsigned int)(floor(size/2.0));
        float *tmp = (float*)malloc(sizeof(float)*len);