commit-gnuradio
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Commit-gnuradio] r11301 - in gnuradio/branches/releases/3.2: . gnuradio


From: jcorgan
Subject: [Commit-gnuradio] r11301 - in gnuradio/branches/releases/3.2: . gnuradio-core/src/lib/filter gnuradio-core/src/lib/general gnuradio-core/src/python/gnuradio/gr gnuradio-examples/python/digital gr-pager/src gr-qtgui/src/python gr-usrp/apps gr-usrp/src gr-wxgui/src/python/forms gr-wxgui/src/python/plotter grc/data/platforms/python/blocks grc/src/utils mblock/src/lib usrp/host/lib/legacy usrp2/host/apps usrp2/host/include/usrp2 usrp2/host/lib
Date: Sun, 28 Jun 2009 14:38:08 -0600 (MDT)

Author: jcorgan
Date: 2009-06-28 14:38:07 -0600 (Sun, 28 Jun 2009)
New Revision: 11301

Modified:
   gnuradio/branches/releases/3.2/
   
gnuradio/branches/releases/3.2/gnuradio-core/src/lib/filter/gr_fft_filter_ccc.cc
   
gnuradio/branches/releases/3.2/gnuradio-core/src/lib/filter/gr_fft_filter_fff.cc
   
gnuradio/branches/releases/3.2/gnuradio-core/src/lib/general/gr_align_on_samplenumbers_ss.cc
   
gnuradio/branches/releases/3.2/gnuradio-core/src/lib/general/gr_clock_recovery_mm_cc.cc
   
gnuradio/branches/releases/3.2/gnuradio-core/src/lib/general/gr_constellation_decoder_cb.cc
   
gnuradio/branches/releases/3.2/gnuradio-core/src/lib/general/gr_correlate_access_code_bb.cc
   
gnuradio/branches/releases/3.2/gnuradio-core/src/lib/general/gr_dd_mpsk_sync_cc.cc
   gnuradio/branches/releases/3.2/gnuradio-core/src/lib/general/gr_dpll_bb.cc
   gnuradio/branches/releases/3.2/gnuradio-core/src/lib/general/gr_fft_vfc.cc
   
gnuradio/branches/releases/3.2/gnuradio-core/src/lib/general/gr_ofdm_frame_acquisition.cc
   
gnuradio/branches/releases/3.2/gnuradio-core/src/lib/general/gr_ofdm_sampler.cc
   
gnuradio/branches/releases/3.2/gnuradio-core/src/lib/general/gr_simple_correlator.cc
   gnuradio/branches/releases/3.2/gnuradio-core/src/lib/general/gr_stream_mux.cc
   gnuradio/branches/releases/3.2/gnuradio-core/src/python/gnuradio/gr/pubsub.py
   gnuradio/branches/releases/3.2/gnuradio-examples/python/digital/
   
gnuradio/branches/releases/3.2/gnuradio-examples/python/digital/receive_path.py
   
gnuradio/branches/releases/3.2/gnuradio-examples/python/digital/transmit_path.py
   gnuradio/branches/releases/3.2/gr-pager/src/pager_flex_sync.cc
   gnuradio/branches/releases/3.2/gr-qtgui/src/python/usrp_display.py
   gnuradio/branches/releases/3.2/gr-usrp/apps/usrp_siggen.cc
   gnuradio/branches/releases/3.2/gr-usrp/src/usrp_sink_base.cc
   gnuradio/branches/releases/3.2/gr-usrp/src/usrp_source_base.cc
   gnuradio/branches/releases/3.2/gr-wxgui/src/python/forms/forms.py
   
gnuradio/branches/releases/3.2/gr-wxgui/src/python/plotter/grid_plotter_base.py
   
gnuradio/branches/releases/3.2/grc/data/platforms/python/blocks/blks2_tcp_sink.xml
   
gnuradio/branches/releases/3.2/grc/data/platforms/python/blocks/blks2_tcp_source.xml
   
gnuradio/branches/releases/3.2/grc/data/platforms/python/blocks/blks2_variable_sink_x.xml
   gnuradio/branches/releases/3.2/grc/data/platforms/python/blocks/gr_add_xx.xml
   
gnuradio/branches/releases/3.2/grc/data/platforms/python/blocks/gr_channel_model.xml
   
gnuradio/branches/releases/3.2/grc/data/platforms/python/blocks/gr_multiply_xx.xml
   gnuradio/branches/releases/3.2/grc/src/utils/odict.py
   gnuradio/branches/releases/3.2/mblock/src/lib/mb_worker.cc
   gnuradio/branches/releases/3.2/mblock/src/lib/qa_bitset.cc
   gnuradio/branches/releases/3.2/mblock/src/lib/qa_disconnect.cc
   gnuradio/branches/releases/3.2/usrp/host/lib/legacy/db_boards.cc
   gnuradio/branches/releases/3.2/usrp/host/lib/legacy/db_dbs_rx.cc
   gnuradio/branches/releases/3.2/usrp/host/lib/legacy/db_xcvr2450.cc
   gnuradio/branches/releases/3.2/usrp/host/lib/legacy/fusb_linux.cc
   gnuradio/branches/releases/3.2/usrp/host/lib/legacy/usrp_basic.cc
   gnuradio/branches/releases/3.2/usrp/host/lib/legacy/usrp_standard.cc
   gnuradio/branches/releases/3.2/usrp2/host/apps/find_usrps.cc
   gnuradio/branches/releases/3.2/usrp2/host/apps/gpio.cc
   gnuradio/branches/releases/3.2/usrp2/host/apps/rx_streaming_samples.cc
   gnuradio/branches/releases/3.2/usrp2/host/apps/test_mimo_tx.cc
   gnuradio/branches/releases/3.2/usrp2/host/apps/tx_samples.cc
   gnuradio/branches/releases/3.2/usrp2/host/include/usrp2/mimo_config.h
   gnuradio/branches/releases/3.2/usrp2/host/lib/eth_buffer.cc
   gnuradio/branches/releases/3.2/usrp2/host/lib/ethernet.cc
   gnuradio/branches/releases/3.2/usrp2/host/lib/find.cc
   gnuradio/branches/releases/3.2/usrp2/host/lib/usrp2.cc
Log:
Applied changeset r11264:11271 to release 3.2 branch.


Property changes on: gnuradio/branches/releases/3.2
___________________________________________________________________
Modified: svn:mergeinfo
   - /gnuradio/branches/developers/eb/t348:10638-10648
/gnuradio/branches/developers/eb/t364:11016-11017
/gnuradio/branches/developers/eb/t367:11021-11025
/gnuradio/branches/developers/eb/t371:10958-10971
/gnuradio/branches/developers/eb/t378:10683-10688
/gnuradio/branches/developers/jblum/grc:10680-10938
/gnuradio/branches/developers/jblum/gui_guts:10464-10658
/gnuradio/branches/developers/jblum/vlen:10667-10677
/gnuradio/branches/developers/jblum/wxgui:11125-11183
/gnuradio/branches/developers/jcorgan/cpphier:10818-10858
/gnuradio/branches/developers/jcorgan/deb:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/branches/developers/jcorgan/fw-optimize:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2:10713-10765
/gnuradio/branches/developers/jcorgan/t161:10876-10880
/gnuradio/branches/developers/michaelld/am_swig_4:10555-10595
/gnuradio/branches/developers/michaelld/two_mods:10540-10546
/gnuradio/trunk:10356-10359,10400,10481-10482,10497-10499,10506-10507,10511,10514,10521,10523-10524,10529,10531,10535,10537-10538,10550-10551,10556,10558-10560,10562-10563,10565,10574-10576,10578-10579,10581-10582,10585,10587,10596-10600,10623-10624,10629,10632-10634,10645-10646,10649-10650,10653-10655,10660-10661,10671,10673,10678,10681,10686,10689,10691,10701-10702,10707-10710,10714-10721,10725,10728-10736,10739-10751,10759-10762,10766,10768-10769,10778-10779,10787-10789,10793,10826,10847-10848,10850,10852-10853,10859,10861-10862,10864-10865,10869,10871-10872,10877-10878,10881,10884,10890,10907-10908,10919-10923,10925,10932,10941-10944,10946-10947,10958,10969-10970,10972,10974-10975,10978-10981,10992,10998-11001,11014,11018,11027,11029-11033,11043,11047,11050,11062-11063,11072,11078,11080-11082,11084-11091,11099,11101,11106,11109,11111-11112,11115-11122,11130,11160-11173,11175,11182,11184-11185,11200,11209,11216,11224-11231,11239-11241,11254,11261
   + /gnuradio/branches/developers/eb/t348:10638-10648
/gnuradio/branches/developers/eb/t364:11016-11017
/gnuradio/branches/developers/eb/t367:11021-11025
/gnuradio/branches/developers/eb/t371:10958-10971
/gnuradio/branches/developers/eb/t378:10683-10688
/gnuradio/branches/developers/jblum/grc:10680-10938
/gnuradio/branches/developers/jblum/gui_guts:10464-10658
/gnuradio/branches/developers/jblum/vlen:10667-10677
/gnuradio/branches/developers/jblum/wxgui:11125-11183
/gnuradio/branches/developers/jcorgan/cpphier:10818-10858
/gnuradio/branches/developers/jcorgan/deb:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/branches/developers/jcorgan/fw-optimize:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2:10713-10765
/gnuradio/branches/developers/jcorgan/t161:10876-10880
/gnuradio/branches/developers/michaelld/am_swig_4:10555-10595
/gnuradio/branches/developers/michaelld/two_mods:10540-10546
/gnuradio/trunk:10356-10359,10400,10481-10482,10497-10499,10506-10507,10511,10514,10521,10523-10524,10529,10531,10535,10537-10538,10550-10551,10556,10558-10560,10562-10563,10565,10574-10576,10578-10579,10581-10582,10585,10587,10596-10600,10623-10624,10629,10632-10634,10645-10646,10649-10650,10653-10655,10660-10661,10671,10673,10678,10681,10686,10689,10691,10701-10702,10707-10710,10714-10721,10725,10728-10736,10739-10751,10759-10762,10766,10768-10769,10778-10779,10787-10789,10793,10826,10847-10848,10850,10852-10853,10859,10861-10862,10864-10865,10869,10871-10872,10877-10878,10881,10884,10890,10907-10908,10919-10923,10925,10932,10941-10944,10946-10947,10958,10969-10970,10972,10974-10975,10978-10981,10992,10998-11001,11014,11018,11027,11029-11033,11043,11047,11050,11062-11063,11072,11078,11080-11082,11084-11091,11099,11101,11106,11109,11111-11112,11115-11122,11130,11160-11173,11175,11182,11184-11185,11200,11209,11216,11224-11231,11239-11241,11254,11261,11265-11271

Modified: 
gnuradio/branches/releases/3.2/gnuradio-core/src/lib/filter/gr_fft_filter_ccc.cc
===================================================================
--- 
gnuradio/branches/releases/3.2/gnuradio-core/src/lib/filter/gr_fft_filter_ccc.cc
    2009-06-28 20:32:51 UTC (rev 11300)
+++ 
gnuradio/branches/releases/3.2/gnuradio-core/src/lib/filter/gr_fft_filter_ccc.cc
    2009-06-28 20:38:07 UTC (rev 11301)
@@ -37,6 +37,7 @@
 #include <stdexcept>
 #include <gr_firdes.h>
 
+#include <cstdio>
 #include <iostream>
 #include <string.h>
 

Modified: 
gnuradio/branches/releases/3.2/gnuradio-core/src/lib/filter/gr_fft_filter_fff.cc
===================================================================
--- 
gnuradio/branches/releases/3.2/gnuradio-core/src/lib/filter/gr_fft_filter_fff.cc
    2009-06-28 20:32:51 UTC (rev 11300)
+++ 
gnuradio/branches/releases/3.2/gnuradio-core/src/lib/filter/gr_fft_filter_fff.cc
    2009-06-28 20:38:07 UTC (rev 11301)
@@ -32,6 +32,8 @@
 #include <stdexcept>
 #include <gr_firdes.h>
 
+
+#include <cstdio>
 #include <iostream>
 #include <string.h>
 

Modified: 
gnuradio/branches/releases/3.2/gnuradio-core/src/lib/general/gr_align_on_samplenumbers_ss.cc
===================================================================
--- 
gnuradio/branches/releases/3.2/gnuradio-core/src/lib/general/gr_align_on_samplenumbers_ss.cc
        2009-06-28 20:32:51 UTC (rev 11300)
+++ 
gnuradio/branches/releases/3.2/gnuradio-core/src/lib/general/gr_align_on_samplenumbers_ss.cc
        2009-06-28 20:38:07 UTC (rev 11301)
@@ -29,6 +29,7 @@
 #include <assert.h>
 #include <stdexcept>
 #include <string.h>
+#include <cstdio>
 
 //define ALIGN_ADVANCED_IMPLEMENTATION to have an alternative implementation 
of the align algoritm which exactly follows the align_interval spec.
 //It is more resource intensive, less tested and probably not needed

Modified: 
gnuradio/branches/releases/3.2/gnuradio-core/src/lib/general/gr_clock_recovery_mm_cc.cc
===================================================================
--- 
gnuradio/branches/releases/3.2/gnuradio-core/src/lib/general/gr_clock_recovery_mm_cc.cc
     2009-06-28 20:32:51 UTC (rev 11300)
+++ 
gnuradio/branches/releases/3.2/gnuradio-core/src/lib/general/gr_clock_recovery_mm_cc.cc
     2009-06-28 20:38:07 UTC (rev 11301)
@@ -29,7 +29,9 @@
 #include <gr_clock_recovery_mm_cc.h>
 #include <gri_mmse_fir_interpolator_cc.h>
 #include <stdexcept>
+#include <cstdio>
 
+
 // Public constructor
 
 

Modified: 
gnuradio/branches/releases/3.2/gnuradio-core/src/lib/general/gr_constellation_decoder_cb.cc
===================================================================
--- 
gnuradio/branches/releases/3.2/gnuradio-core/src/lib/general/gr_constellation_decoder_cb.cc
 2009-06-28 20:32:51 UTC (rev 11300)
+++ 
gnuradio/branches/releases/3.2/gnuradio-core/src/lib/general/gr_constellation_decoder_cb.cc
 2009-06-28 20:38:07 UTC (rev 11301)
@@ -28,6 +28,7 @@
 #include <gr_io_signature.h>
 #include <stdexcept>
 
+#include <cstdio>
 #include <iostream>
 using std::cout;
 using std::endl;

Modified: 
gnuradio/branches/releases/3.2/gnuradio-core/src/lib/general/gr_correlate_access_code_bb.cc
===================================================================
--- 
gnuradio/branches/releases/3.2/gnuradio-core/src/lib/general/gr_correlate_access_code_bb.cc
 2009-06-28 20:32:51 UTC (rev 11300)
+++ 
gnuradio/branches/releases/3.2/gnuradio-core/src/lib/general/gr_correlate_access_code_bb.cc
 2009-06-28 20:38:07 UTC (rev 11301)
@@ -28,7 +28,9 @@
 #include <gr_io_signature.h>
 #include <stdexcept>
 #include <gr_count_bits.h>
+#include <cstdio>
 
+
 #define VERBOSE 0
 
 

Modified: 
gnuradio/branches/releases/3.2/gnuradio-core/src/lib/general/gr_dd_mpsk_sync_cc.cc
===================================================================
--- 
gnuradio/branches/releases/3.2/gnuradio-core/src/lib/general/gr_dd_mpsk_sync_cc.cc
  2009-06-28 20:32:51 UTC (rev 11300)
+++ 
gnuradio/branches/releases/3.2/gnuradio-core/src/lib/general/gr_dd_mpsk_sync_cc.cc
  2009-06-28 20:38:07 UTC (rev 11301)
@@ -30,6 +30,7 @@
 #include <gri_mmse_fir_interpolator_cc.h>
 #include <math.h>
 #include <stdexcept>
+#include <cstdio>
 
 #include <gr_complex.h>
 

Modified: 
gnuradio/branches/releases/3.2/gnuradio-core/src/lib/general/gr_dpll_bb.cc
===================================================================
--- gnuradio/branches/releases/3.2/gnuradio-core/src/lib/general/gr_dpll_bb.cc  
2009-06-28 20:32:51 UTC (rev 11300)
+++ gnuradio/branches/releases/3.2/gnuradio-core/src/lib/general/gr_dpll_bb.cc  
2009-06-28 20:38:07 UTC (rev 11301)
@@ -26,6 +26,7 @@
 
 #include <gr_dpll_bb.h>
 #include <gr_io_signature.h>
+#include <cstdio>
 
 gr_dpll_bb_sptr
 gr_make_dpll_bb (float period, float gain)

Modified: 
gnuradio/branches/releases/3.2/gnuradio-core/src/lib/general/gr_fft_vfc.cc
===================================================================
--- gnuradio/branches/releases/3.2/gnuradio-core/src/lib/general/gr_fft_vfc.cc  
2009-06-28 20:32:51 UTC (rev 11300)
+++ gnuradio/branches/releases/3.2/gnuradio-core/src/lib/general/gr_fft_vfc.cc  
2009-06-28 20:38:07 UTC (rev 11301)
@@ -30,6 +30,7 @@
 #include <math.h>
 #include <stdexcept>
 #include <string.h>
+#include <cstdio>
 
 
 // FIXME after this is working, change to use native real to complex fft.

Modified: 
gnuradio/branches/releases/3.2/gnuradio-core/src/lib/general/gr_ofdm_frame_acquisition.cc
===================================================================
--- 
gnuradio/branches/releases/3.2/gnuradio-core/src/lib/general/gr_ofdm_frame_acquisition.cc
   2009-06-28 20:32:51 UTC (rev 11300)
+++ 
gnuradio/branches/releases/3.2/gnuradio-core/src/lib/general/gr_ofdm_frame_acquisition.cc
   2009-06-28 20:38:07 UTC (rev 11301)
@@ -28,6 +28,7 @@
 #include <gr_io_signature.h>
 #include <gr_expj.h>
 #include <gr_math.h>
+#include <cstdio>
 
 #define VERBOSE 0
 #define M_TWOPI (2*M_PI)

Modified: 
gnuradio/branches/releases/3.2/gnuradio-core/src/lib/general/gr_ofdm_sampler.cc
===================================================================
--- 
gnuradio/branches/releases/3.2/gnuradio-core/src/lib/general/gr_ofdm_sampler.cc 
    2009-06-28 20:32:51 UTC (rev 11300)
+++ 
gnuradio/branches/releases/3.2/gnuradio-core/src/lib/general/gr_ofdm_sampler.cc 
    2009-06-28 20:38:07 UTC (rev 11301)
@@ -27,6 +27,7 @@
 #include <gr_ofdm_sampler.h>
 #include <gr_io_signature.h>
 #include <gr_expj.h>
+#include <cstdio>
 
 gr_ofdm_sampler_sptr
 gr_make_ofdm_sampler (unsigned int fft_length, 

Modified: 
gnuradio/branches/releases/3.2/gnuradio-core/src/lib/general/gr_simple_correlator.cc
===================================================================
--- 
gnuradio/branches/releases/3.2/gnuradio-core/src/lib/general/gr_simple_correlator.cc
        2009-06-28 20:32:51 UTC (rev 11300)
+++ 
gnuradio/branches/releases/3.2/gnuradio-core/src/lib/general/gr_simple_correlator.cc
        2009-06-28 20:38:07 UTC (rev 11301)
@@ -31,6 +31,7 @@
 #include <stdexcept>
 #include <gr_count_bits.h>
 #include <string.h>
+#include <cstdio>
 
 
 static const int THRESHOLD = 3;

Modified: 
gnuradio/branches/releases/3.2/gnuradio-core/src/lib/general/gr_stream_mux.cc
===================================================================
--- 
gnuradio/branches/releases/3.2/gnuradio-core/src/lib/general/gr_stream_mux.cc   
    2009-06-28 20:32:51 UTC (rev 11300)
+++ 
gnuradio/branches/releases/3.2/gnuradio-core/src/lib/general/gr_stream_mux.cc   
    2009-06-28 20:38:07 UTC (rev 11301)
@@ -27,6 +27,7 @@
 #include <gr_stream_mux.h>
 #include <gr_io_signature.h>
 #include <string.h>
+#include <cstdio>
 
 #define VERBOSE 0
 


Property changes on: 
gnuradio/branches/releases/3.2/gnuradio-core/src/python/gnuradio/gr/pubsub.py
___________________________________________________________________
Modified: svn:mergeinfo
   - 
/gnuradio/branches/developers/eb/t348/gnuradio-core/src/python/gnuradio/gr/pubsub.py:10638-10648
/gnuradio/branches/developers/eb/t364/gnuradio-core/src/python/gnuradio/gr/pubsub.py:11016-11017
/gnuradio/branches/developers/eb/t367/gnuradio-core/src/python/gnuradio/gr/pubsub.py:11021-11025
/gnuradio/branches/developers/eb/t371/gnuradio-core/src/python/gnuradio/gr/pubsub.py:10958-10971
/gnuradio/branches/developers/eb/t378/gnuradio-core/src/python/gnuradio/gr/pubsub.py:10683-10688
/gnuradio/branches/developers/jblum/grc/gnuradio-core/src/python/gnuradio/gr/pubsub.py:10680-10938
/gnuradio/branches/developers/jblum/vlen/gnuradio-core/src/python/gnuradio/gr/pubsub.py:10667-10677
/gnuradio/branches/developers/jblum/wxgui/gnuradio-core/src/python/gnuradio/gr/pubsub.py:11125-11183
/gnuradio/branches/developers/jcorgan/cpphier/gnuradio-core/src/python/gnuradio/gr/pubsub.py:10818-10858
/gnuradio/branches/developers/jcorgan/deb/gnuradio-core/src/python/gnuradio/gr/pubsub.py:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/branches/developers/jcorgan/gpio2/gnuradio-core/src/python/gnuradio/gr/pubsub.py:10713-10765
/gnuradio/branches/developers/jcorgan/t161/gnuradio-core/src/python/gnuradio/gr/pubsub.py:10876-10880
/gnuradio/trunk/gnuradio-core/src/python/gnuradio/gr/pubsub.py:10400,10653-10655,10660-10661,10671,10673,10678,10681,10686,10689,10691,10701-10702,10707-10710,10714-10721,10725,10728-10736,10739-10751,10759-10762,10766,10768-10769,10778-10779,10787-10789,10793,10826,10847-10848,10850,10852-10853,10859,10861-10862,10864-10865,10869,10871-10872,10877-10878,10881,10884,10890,10907-10908,10919-10923,10925,10932,10941-10944,10946-10947,10958,10969-10970,10972,10974-10975,10978-10981,10992,10998-11001,11014,11018,11027,11029-11033,11043,11047,11050,11062-11063,11072,11078,11080-11082,11084-11091,11099,11101,11106,11109,11111-11112,11115-11122,11130,11160-11173,11175,11182,11184-11185,11200,11209,11216,11224-11231,11239-11241,11254,11261
   + 
/gnuradio/branches/developers/eb/t348/gnuradio-core/src/python/gnuradio/gr/pubsub.py:10638-10648
/gnuradio/branches/developers/eb/t364/gnuradio-core/src/python/gnuradio/gr/pubsub.py:11016-11017
/gnuradio/branches/developers/eb/t367/gnuradio-core/src/python/gnuradio/gr/pubsub.py:11021-11025
/gnuradio/branches/developers/eb/t371/gnuradio-core/src/python/gnuradio/gr/pubsub.py:10958-10971
/gnuradio/branches/developers/eb/t378/gnuradio-core/src/python/gnuradio/gr/pubsub.py:10683-10688
/gnuradio/branches/developers/jblum/grc/gnuradio-core/src/python/gnuradio/gr/pubsub.py:10680-10938
/gnuradio/branches/developers/jblum/vlen/gnuradio-core/src/python/gnuradio/gr/pubsub.py:10667-10677
/gnuradio/branches/developers/jblum/wxgui/gnuradio-core/src/python/gnuradio/gr/pubsub.py:11125-11183
/gnuradio/branches/developers/jcorgan/cpphier/gnuradio-core/src/python/gnuradio/gr/pubsub.py:10818-10858
/gnuradio/branches/developers/jcorgan/deb/gnuradio-core/src/python/gnuradio/gr/pubsub.py:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/branches/developers/jcorgan/gpio2/gnuradio-core/src/python/gnuradio/gr/pubsub.py:10713-10765
/gnuradio/branches/developers/jcorgan/t161/gnuradio-core/src/python/gnuradio/gr/pubsub.py:10876-10880
/gnuradio/trunk/gnuradio-core/src/python/gnuradio/gr/pubsub.py:10400,10653-10655,10660-10661,10671,10673,10678,10681,10686,10689,10691,10701-10702,10707-10710,10714-10721,10725,10728-10736,10739-10751,10759-10762,10766,10768-10769,10778-10779,10787-10789,10793,10826,10847-10848,10850,10852-10853,10859,10861-10862,10864-10865,10869,10871-10872,10877-10878,10881,10884,10890,10907-10908,10919-10923,10925,10932,10941-10944,10946-10947,10958,10969-10970,10972,10974-10975,10978-10981,10992,10998-11001,11014,11018,11027,11029-11033,11043,11047,11050,11062-11063,11072,11078,11080-11082,11084-11091,11099,11101,11106,11109,11111-11112,11115-11122,11130,11160-11173,11175,11182,11184-11185,11200,11209,11216,11224-11231,11239-11241,11254,11261,11265-11271


Property changes on: 
gnuradio/branches/releases/3.2/gnuradio-examples/python/digital
___________________________________________________________________
Modified: svn:mergeinfo
   - 
/gnuradio/branches/developers/eb/t348/gnuradio-examples/python/digital:10638-10648
/gnuradio/branches/developers/eb/t364/gnuradio-examples/python/digital:11016-11017
/gnuradio/branches/developers/eb/t367/gnuradio-examples/python/digital:11021-11025
/gnuradio/branches/developers/eb/t371/gnuradio-examples/python/digital:10958-10971
/gnuradio/branches/developers/eb/t378/gnuradio-examples/python/digital:10683-10688
/gnuradio/branches/developers/jblum/digital:10901-10941,10943-11199
/gnuradio/branches/developers/jblum/grc/gnuradio-examples/python/digital:10680-10938
/gnuradio/branches/developers/jblum/gui_guts/gnuradio-examples/python/digital:10464-10658
/gnuradio/branches/developers/jblum/vlen/gnuradio-examples/python/digital:10667-10677
/gnuradio/branches/developers/jblum/wxgui/gnuradio-examples/python/digital:11125-11183
/gnuradio/branches/developers/jcorgan/cpphier/gnuradio-examples/python/digital:10818-10858
/gnuradio/branches/developers/jcorgan/deb/gnuradio-examples/python/digital:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/branches/developers/jcorgan/fw-optimize/gnuradio-examples/python/digital:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/gnuradio-examples/python/digital:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/gnuradio-examples/python/digital:10771-10887
/gnuradio/branches/developers/jcorgan/t161/gnuradio-examples/python/digital:10876-10880
/gnuradio/branches/developers/michaelld/am_swig_4/gnuradio-examples/python/digital:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/gnuradio-examples/python/digital:10540-10546
/gnuradio/branches/developers/trondeau/digital/gnuradio-examples/python/digital:11193-11205
/gnuradio/branches/developers/trondeau/qtdigital/gnuradio-examples/python/digital:11210-11215
/gnuradio/trunk/gnuradio-examples/python/digital:10400,10942,10972,10975,10979,10981,11000-11001,11014,11018,11027,11029-11033,11043,11047,11050,11062-11063,11072,11078,11080-11082,11084-11091,11099,11101,11106,11109,11111-11112,11115-11122,11130,11160-11173,11175,11182,11184-11185,11200,11209,11216,11224-11231,11239-11241,11254,11261
   + 
/gnuradio/branches/developers/eb/t348/gnuradio-examples/python/digital:10638-10648
/gnuradio/branches/developers/eb/t364/gnuradio-examples/python/digital:11016-11017
/gnuradio/branches/developers/eb/t367/gnuradio-examples/python/digital:11021-11025
/gnuradio/branches/developers/eb/t371/gnuradio-examples/python/digital:10958-10971
/gnuradio/branches/developers/eb/t378/gnuradio-examples/python/digital:10683-10688
/gnuradio/branches/developers/jblum/digital:10901-10941,10943-11199
/gnuradio/branches/developers/jblum/grc/gnuradio-examples/python/digital:10680-10938
/gnuradio/branches/developers/jblum/gui_guts/gnuradio-examples/python/digital:10464-10658
/gnuradio/branches/developers/jblum/vlen/gnuradio-examples/python/digital:10667-10677
/gnuradio/branches/developers/jblum/wxgui/gnuradio-examples/python/digital:11125-11183
/gnuradio/branches/developers/jcorgan/cpphier/gnuradio-examples/python/digital:10818-10858
/gnuradio/branches/developers/jcorgan/deb/gnuradio-examples/python/digital:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/branches/developers/jcorgan/fw-optimize/gnuradio-examples/python/digital:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/gnuradio-examples/python/digital:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/gnuradio-examples/python/digital:10771-10887
/gnuradio/branches/developers/jcorgan/t161/gnuradio-examples/python/digital:10876-10880
/gnuradio/branches/developers/michaelld/am_swig_4/gnuradio-examples/python/digital:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/gnuradio-examples/python/digital:10540-10546
/gnuradio/branches/developers/trondeau/digital/gnuradio-examples/python/digital:11193-11205
/gnuradio/branches/developers/trondeau/qtdigital/gnuradio-examples/python/digital:11210-11215
/gnuradio/trunk/gnuradio-examples/python/digital:10400,10942,10972,10975,10979,10981,11000-11001,11014,11018,11027,11029-11033,11043,11047,11050,11062-11063,11072,11078,11080-11082,11084-11091,11099,11101,11106,11109,11111-11112,11115-11122,11130,11160-11173,11175,11182,11184-11185,11200,11209,11216,11224-11231,11239-11241,11254,11261,11265-11271


Property changes on: 
gnuradio/branches/releases/3.2/gnuradio-examples/python/digital/receive_path.py
___________________________________________________________________
Modified: svn:mergeinfo
   - 
/gnuradio/branches/developers/eb/t348/gnuradio-examples/python/digital/receive_path.py:10638-10648
/gnuradio/branches/developers/eb/t348/gnuradio-examples/python/digital/receive_path_lb.py:10638-10648
/gnuradio/branches/developers/eb/t364/gnuradio-examples/python/digital/receive_path.py:11016-11017
/gnuradio/branches/developers/eb/t364/gnuradio-examples/python/digital/receive_path_lb.py:11016-11017
/gnuradio/branches/developers/eb/t367/gnuradio-examples/python/digital/receive_path.py:11021-11025
/gnuradio/branches/developers/eb/t367/gnuradio-examples/python/digital/receive_path_lb.py:11021-11025
/gnuradio/branches/developers/eb/t371/gnuradio-examples/python/digital/receive_path.py:10958-10971
/gnuradio/branches/developers/eb/t371/gnuradio-examples/python/digital/receive_path_lb.py:10958-10971
/gnuradio/branches/developers/eb/t378/gnuradio-examples/python/digital/receive_path.py:10683-10688
/gnuradio/branches/developers/eb/t378/gnuradio-examples/python/digital/receive_path_lb.py:10683-10688
/gnuradio/branches/developers/jblum/digital/receive_path.py:10901-10941,10943-11199
/gnuradio/branches/developers/jblum/digital/receive_path_lb.py:10901-10941
/gnuradio/branches/developers/jblum/grc/gnuradio-examples/python/digital/receive_path.py:10680-10938
/gnuradio/branches/developers/jblum/grc/gnuradio-examples/python/digital/receive_path_lb.py:10680-10938
/gnuradio/branches/developers/jblum/gui_guts/gnuradio-examples/python/digital/receive_path.py:10464-10658
/gnuradio/branches/developers/jblum/gui_guts/gnuradio-examples/python/digital/receive_path_lb.py:10464-10658
/gnuradio/branches/developers/jblum/vlen/gnuradio-examples/python/digital/receive_path.py:10667-10677
/gnuradio/branches/developers/jblum/vlen/gnuradio-examples/python/digital/receive_path_lb.py:10667-10677
/gnuradio/branches/developers/jblum/wxgui/gnuradio-examples/python/digital/receive_path.py:11125-11183
/gnuradio/branches/developers/jblum/wxgui/gnuradio-examples/python/digital/receive_path_lb.py:11125-11183
/gnuradio/branches/developers/jcorgan/cpphier/gnuradio-examples/python/digital/receive_path.py:10818-10858
/gnuradio/branches/developers/jcorgan/cpphier/gnuradio-examples/python/digital/receive_path_lb.py:10818-10858
/gnuradio/branches/developers/jcorgan/deb/gnuradio-examples/python/digital/receive_path.py:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/branches/developers/jcorgan/deb/gnuradio-examples/python/digital/receive_path_lb.py:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/branches/developers/jcorgan/fw-optimize/gnuradio-examples/python/digital/receive_path.py:10428-10429
/gnuradio/branches/developers/jcorgan/fw-optimize/gnuradio-examples/python/digital/receive_path_lb.py:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/gnuradio-examples/python/digital/receive_path.py:10713-10765
/gnuradio/branches/developers/jcorgan/gpio2/gnuradio-examples/python/digital/receive_path_lb.py:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/gnuradio-examples/python/digital/receive_path.py:10771-10887
/gnuradio/branches/developers/jcorgan/iad2/gnuradio-examples/python/digital/receive_path_lb.py:10771-10887
/gnuradio/branches/developers/jcorgan/np/gnuradio-examples/python/digital/receive_path_lb.py:11124-11148
/gnuradio/branches/developers/jcorgan/t161/gnuradio-examples/python/digital/receive_path.py:10876-10880
/gnuradio/branches/developers/jcorgan/t161/gnuradio-examples/python/digital/receive_path_lb.py:10876-10880
/gnuradio/branches/developers/michaelld/am_swig_4/gnuradio-examples/python/digital/receive_path.py:10555-10595
/gnuradio/branches/developers/michaelld/am_swig_4/gnuradio-examples/python/digital/receive_path_lb.py:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/gnuradio-examples/python/digital/receive_path.py:10540-10546
/gnuradio/branches/developers/michaelld/two_mods/gnuradio-examples/python/digital/receive_path_lb.py:10540-10546
/gnuradio/branches/developers/trondeau/digital/gnuradio-examples/python/digital/receive_path.py:11193-11205
/gnuradio/branches/developers/trondeau/qtdigital/gnuradio-examples/python/digital/receive_path.py:11210-11215
/gnuradio/trunk/gnuradio-examples/python/digital/receive_path.py:10400,10942,10972,10975,10979,10981,11000-11001,11014,11018,11027,11029-11033,11043,11047,11050,11062-11063,11072,11078,11080-11082,11084-11091,11099,11101,11106,11109,11111-11112,11115-11122,11130,11160-11173,11175,11182,11184-11185,11200,11209,11216,11224-11231,11239-11241,11254,11261
   + 
/gnuradio/branches/developers/eb/t348/gnuradio-examples/python/digital/receive_path.py:10638-10648
/gnuradio/branches/developers/eb/t348/gnuradio-examples/python/digital/receive_path_lb.py:10638-10648
/gnuradio/branches/developers/eb/t364/gnuradio-examples/python/digital/receive_path.py:11016-11017
/gnuradio/branches/developers/eb/t364/gnuradio-examples/python/digital/receive_path_lb.py:11016-11017
/gnuradio/branches/developers/eb/t367/gnuradio-examples/python/digital/receive_path.py:11021-11025
/gnuradio/branches/developers/eb/t367/gnuradio-examples/python/digital/receive_path_lb.py:11021-11025
/gnuradio/branches/developers/eb/t371/gnuradio-examples/python/digital/receive_path.py:10958-10971
/gnuradio/branches/developers/eb/t371/gnuradio-examples/python/digital/receive_path_lb.py:10958-10971
/gnuradio/branches/developers/eb/t378/gnuradio-examples/python/digital/receive_path.py:10683-10688
/gnuradio/branches/developers/eb/t378/gnuradio-examples/python/digital/receive_path_lb.py:10683-10688
/gnuradio/branches/developers/jblum/digital/receive_path.py:10901-10941,10943-11199
/gnuradio/branches/developers/jblum/digital/receive_path_lb.py:10901-10941
/gnuradio/branches/developers/jblum/grc/gnuradio-examples/python/digital/receive_path.py:10680-10938
/gnuradio/branches/developers/jblum/grc/gnuradio-examples/python/digital/receive_path_lb.py:10680-10938
/gnuradio/branches/developers/jblum/gui_guts/gnuradio-examples/python/digital/receive_path.py:10464-10658
/gnuradio/branches/developers/jblum/gui_guts/gnuradio-examples/python/digital/receive_path_lb.py:10464-10658
/gnuradio/branches/developers/jblum/vlen/gnuradio-examples/python/digital/receive_path.py:10667-10677
/gnuradio/branches/developers/jblum/vlen/gnuradio-examples/python/digital/receive_path_lb.py:10667-10677
/gnuradio/branches/developers/jblum/wxgui/gnuradio-examples/python/digital/receive_path.py:11125-11183
/gnuradio/branches/developers/jblum/wxgui/gnuradio-examples/python/digital/receive_path_lb.py:11125-11183
/gnuradio/branches/developers/jcorgan/cpphier/gnuradio-examples/python/digital/receive_path.py:10818-10858
/gnuradio/branches/developers/jcorgan/cpphier/gnuradio-examples/python/digital/receive_path_lb.py:10818-10858
/gnuradio/branches/developers/jcorgan/deb/gnuradio-examples/python/digital/receive_path.py:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/branches/developers/jcorgan/deb/gnuradio-examples/python/digital/receive_path_lb.py:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/branches/developers/jcorgan/fw-optimize/gnuradio-examples/python/digital/receive_path.py:10428-10429
/gnuradio/branches/developers/jcorgan/fw-optimize/gnuradio-examples/python/digital/receive_path_lb.py:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/gnuradio-examples/python/digital/receive_path.py:10713-10765
/gnuradio/branches/developers/jcorgan/gpio2/gnuradio-examples/python/digital/receive_path_lb.py:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/gnuradio-examples/python/digital/receive_path.py:10771-10887
/gnuradio/branches/developers/jcorgan/iad2/gnuradio-examples/python/digital/receive_path_lb.py:10771-10887
/gnuradio/branches/developers/jcorgan/np/gnuradio-examples/python/digital/receive_path_lb.py:11124-11148
/gnuradio/branches/developers/jcorgan/t161/gnuradio-examples/python/digital/receive_path.py:10876-10880
/gnuradio/branches/developers/jcorgan/t161/gnuradio-examples/python/digital/receive_path_lb.py:10876-10880
/gnuradio/branches/developers/michaelld/am_swig_4/gnuradio-examples/python/digital/receive_path.py:10555-10595
/gnuradio/branches/developers/michaelld/am_swig_4/gnuradio-examples/python/digital/receive_path_lb.py:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/gnuradio-examples/python/digital/receive_path.py:10540-10546
/gnuradio/branches/developers/michaelld/two_mods/gnuradio-examples/python/digital/receive_path_lb.py:10540-10546
/gnuradio/branches/developers/trondeau/digital/gnuradio-examples/python/digital/receive_path.py:11193-11205
/gnuradio/branches/developers/trondeau/qtdigital/gnuradio-examples/python/digital/receive_path.py:11210-11215
/gnuradio/trunk/gnuradio-examples/python/digital/receive_path.py:10400,10942,10972,10975,10979,10981,11000-11001,11014,11018,11027,11029-11033,11043,11047,11050,11062-11063,11072,11078,11080-11082,11084-11091,11099,11101,11106,11109,11111-11112,11115-11122,11130,11160-11173,11175,11182,11184-11185,11200,11209,11216,11224-11231,11239-11241,11254,11261,11265-11271


Property changes on: 
gnuradio/branches/releases/3.2/gnuradio-examples/python/digital/transmit_path.py
___________________________________________________________________
Modified: svn:mergeinfo
   - 
/gnuradio/branches/developers/eb/t348/gnuradio-examples/python/digital/transmit_path.py:10638-10648
/gnuradio/branches/developers/eb/t348/gnuradio-examples/python/digital/transmit_path_lb.py:10638-10648
/gnuradio/branches/developers/eb/t364/gnuradio-examples/python/digital/transmit_path.py:11016-11017
/gnuradio/branches/developers/eb/t364/gnuradio-examples/python/digital/transmit_path_lb.py:11016-11017
/gnuradio/branches/developers/eb/t367/gnuradio-examples/python/digital/transmit_path.py:11021-11025
/gnuradio/branches/developers/eb/t367/gnuradio-examples/python/digital/transmit_path_lb.py:11021-11025
/gnuradio/branches/developers/eb/t371/gnuradio-examples/python/digital/transmit_path.py:10958-10971
/gnuradio/branches/developers/eb/t371/gnuradio-examples/python/digital/transmit_path_lb.py:10958-10971
/gnuradio/branches/developers/eb/t378/gnuradio-examples/python/digital/transmit_path.py:10683-10688
/gnuradio/branches/developers/eb/t378/gnuradio-examples/python/digital/transmit_path_lb.py:10683-10688
/gnuradio/branches/developers/jblum/digital/transmit_path.py:10901-10941,10943-11199
/gnuradio/branches/developers/jblum/digital/transmit_path_lb.py:10901-10941
/gnuradio/branches/developers/jblum/grc/gnuradio-examples/python/digital/transmit_path.py:10680-10938
/gnuradio/branches/developers/jblum/grc/gnuradio-examples/python/digital/transmit_path_lb.py:10680-10938
/gnuradio/branches/developers/jblum/gui_guts/gnuradio-examples/python/digital/transmit_path.py:10464-10658
/gnuradio/branches/developers/jblum/gui_guts/gnuradio-examples/python/digital/transmit_path_lb.py:10464-10658
/gnuradio/branches/developers/jblum/vlen/gnuradio-examples/python/digital/transmit_path.py:10667-10677
/gnuradio/branches/developers/jblum/vlen/gnuradio-examples/python/digital/transmit_path_lb.py:10667-10677
/gnuradio/branches/developers/jblum/wxgui/gnuradio-examples/python/digital/transmit_path.py:11125-11183
/gnuradio/branches/developers/jblum/wxgui/gnuradio-examples/python/digital/transmit_path_lb.py:11125-11183
/gnuradio/branches/developers/jcorgan/cpphier/gnuradio-examples/python/digital/transmit_path.py:10818-10858
/gnuradio/branches/developers/jcorgan/cpphier/gnuradio-examples/python/digital/transmit_path_lb.py:10818-10858
/gnuradio/branches/developers/jcorgan/deb/gnuradio-examples/python/digital/transmit_path.py:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/branches/developers/jcorgan/deb/gnuradio-examples/python/digital/transmit_path_lb.py:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/branches/developers/jcorgan/fw-optimize/gnuradio-examples/python/digital/transmit_path.py:10428-10429
/gnuradio/branches/developers/jcorgan/fw-optimize/gnuradio-examples/python/digital/transmit_path_lb.py:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/gnuradio-examples/python/digital/transmit_path.py:10713-10765
/gnuradio/branches/developers/jcorgan/gpio2/gnuradio-examples/python/digital/transmit_path_lb.py:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/gnuradio-examples/python/digital/transmit_path.py:10771-10887
/gnuradio/branches/developers/jcorgan/iad2/gnuradio-examples/python/digital/transmit_path_lb.py:10771-10887
/gnuradio/branches/developers/jcorgan/np/gnuradio-examples/python/digital/transmit_path_lb.py:11124-11148
/gnuradio/branches/developers/jcorgan/t161/gnuradio-examples/python/digital/transmit_path.py:10876-10880
/gnuradio/branches/developers/jcorgan/t161/gnuradio-examples/python/digital/transmit_path_lb.py:10876-10880
/gnuradio/branches/developers/michaelld/am_swig_4/gnuradio-examples/python/digital/transmit_path.py:10555-10595
/gnuradio/branches/developers/michaelld/am_swig_4/gnuradio-examples/python/digital/transmit_path_lb.py:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/gnuradio-examples/python/digital/transmit_path.py:10540-10546
/gnuradio/branches/developers/michaelld/two_mods/gnuradio-examples/python/digital/transmit_path_lb.py:10540-10546
/gnuradio/branches/developers/trondeau/digital/gnuradio-examples/python/digital/transmit_path.py:11193-11205
/gnuradio/branches/developers/trondeau/qtdigital/gnuradio-examples/python/digital/transmit_path.py:11210-11215
/gnuradio/trunk/gnuradio-examples/python/digital/transmit_path.py:10400,10942,10972,10975,10979,10981,11000-11001,11014,11018,11027,11029-11033,11043,11047,11050,11062-11063,11072,11078,11080-11082,11084-11091,11099,11101,11106,11109,11111-11112,11115-11122,11130,11160-11173,11175,11182,11184-11185,11200,11209,11216,11224-11231,11239-11241,11254,11261
   + 
/gnuradio/branches/developers/eb/t348/gnuradio-examples/python/digital/transmit_path.py:10638-10648
/gnuradio/branches/developers/eb/t348/gnuradio-examples/python/digital/transmit_path_lb.py:10638-10648
/gnuradio/branches/developers/eb/t364/gnuradio-examples/python/digital/transmit_path.py:11016-11017
/gnuradio/branches/developers/eb/t364/gnuradio-examples/python/digital/transmit_path_lb.py:11016-11017
/gnuradio/branches/developers/eb/t367/gnuradio-examples/python/digital/transmit_path.py:11021-11025
/gnuradio/branches/developers/eb/t367/gnuradio-examples/python/digital/transmit_path_lb.py:11021-11025
/gnuradio/branches/developers/eb/t371/gnuradio-examples/python/digital/transmit_path.py:10958-10971
/gnuradio/branches/developers/eb/t371/gnuradio-examples/python/digital/transmit_path_lb.py:10958-10971
/gnuradio/branches/developers/eb/t378/gnuradio-examples/python/digital/transmit_path.py:10683-10688
/gnuradio/branches/developers/eb/t378/gnuradio-examples/python/digital/transmit_path_lb.py:10683-10688
/gnuradio/branches/developers/jblum/digital/transmit_path.py:10901-10941,10943-11199
/gnuradio/branches/developers/jblum/digital/transmit_path_lb.py:10901-10941
/gnuradio/branches/developers/jblum/grc/gnuradio-examples/python/digital/transmit_path.py:10680-10938
/gnuradio/branches/developers/jblum/grc/gnuradio-examples/python/digital/transmit_path_lb.py:10680-10938
/gnuradio/branches/developers/jblum/gui_guts/gnuradio-examples/python/digital/transmit_path.py:10464-10658
/gnuradio/branches/developers/jblum/gui_guts/gnuradio-examples/python/digital/transmit_path_lb.py:10464-10658
/gnuradio/branches/developers/jblum/vlen/gnuradio-examples/python/digital/transmit_path.py:10667-10677
/gnuradio/branches/developers/jblum/vlen/gnuradio-examples/python/digital/transmit_path_lb.py:10667-10677
/gnuradio/branches/developers/jblum/wxgui/gnuradio-examples/python/digital/transmit_path.py:11125-11183
/gnuradio/branches/developers/jblum/wxgui/gnuradio-examples/python/digital/transmit_path_lb.py:11125-11183
/gnuradio/branches/developers/jcorgan/cpphier/gnuradio-examples/python/digital/transmit_path.py:10818-10858
/gnuradio/branches/developers/jcorgan/cpphier/gnuradio-examples/python/digital/transmit_path_lb.py:10818-10858
/gnuradio/branches/developers/jcorgan/deb/gnuradio-examples/python/digital/transmit_path.py:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/branches/developers/jcorgan/deb/gnuradio-examples/python/digital/transmit_path_lb.py:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/branches/developers/jcorgan/fw-optimize/gnuradio-examples/python/digital/transmit_path.py:10428-10429
/gnuradio/branches/developers/jcorgan/fw-optimize/gnuradio-examples/python/digital/transmit_path_lb.py:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/gnuradio-examples/python/digital/transmit_path.py:10713-10765
/gnuradio/branches/developers/jcorgan/gpio2/gnuradio-examples/python/digital/transmit_path_lb.py:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/gnuradio-examples/python/digital/transmit_path.py:10771-10887
/gnuradio/branches/developers/jcorgan/iad2/gnuradio-examples/python/digital/transmit_path_lb.py:10771-10887
/gnuradio/branches/developers/jcorgan/np/gnuradio-examples/python/digital/transmit_path_lb.py:11124-11148
/gnuradio/branches/developers/jcorgan/t161/gnuradio-examples/python/digital/transmit_path.py:10876-10880
/gnuradio/branches/developers/jcorgan/t161/gnuradio-examples/python/digital/transmit_path_lb.py:10876-10880
/gnuradio/branches/developers/michaelld/am_swig_4/gnuradio-examples/python/digital/transmit_path.py:10555-10595
/gnuradio/branches/developers/michaelld/am_swig_4/gnuradio-examples/python/digital/transmit_path_lb.py:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/gnuradio-examples/python/digital/transmit_path.py:10540-10546
/gnuradio/branches/developers/michaelld/two_mods/gnuradio-examples/python/digital/transmit_path_lb.py:10540-10546
/gnuradio/branches/developers/trondeau/digital/gnuradio-examples/python/digital/transmit_path.py:11193-11205
/gnuradio/branches/developers/trondeau/qtdigital/gnuradio-examples/python/digital/transmit_path.py:11210-11215
/gnuradio/trunk/gnuradio-examples/python/digital/transmit_path.py:10400,10942,10972,10975,10979,10981,11000-11001,11014,11018,11027,11029-11033,11043,11047,11050,11062-11063,11072,11078,11080-11082,11084-11091,11099,11101,11106,11109,11111-11112,11115-11122,11130,11160-11173,11175,11182,11184-11185,11200,11209,11216,11224-11231,11239-11241,11254,11261,11265-11271

Modified: gnuradio/branches/releases/3.2/gr-pager/src/pager_flex_sync.cc
===================================================================
--- gnuradio/branches/releases/3.2/gr-pager/src/pager_flex_sync.cc      
2009-06-28 20:32:51 UTC (rev 11300)
+++ gnuradio/branches/releases/3.2/gr-pager/src/pager_flex_sync.cc      
2009-06-28 20:38:07 UTC (rev 11301)
@@ -29,6 +29,7 @@
 #include <pageri_util.h>
 #include <gr_io_signature.h>
 #include <gr_count_bits.h>
+#include <cstdio>
 
 pager_flex_sync_sptr pager_make_flex_sync()
 {


Property changes on: 
gnuradio/branches/releases/3.2/gr-qtgui/src/python/usrp_display.py
___________________________________________________________________
Modified: svn:mergeinfo
   - 
/gnuradio/branches/developers/eb/t364/gr-qtgui/src/python/usrp_display.py:11016-11017
/gnuradio/branches/developers/eb/t367/gr-qtgui/src/python/usrp_display.py:11021-11025
/gnuradio/branches/developers/eb/t371/gr-qtgui/src/python/usrp_display.py:10958-10971
/gnuradio/branches/developers/jblum/wxgui/gr-qtgui/src/python/usrp_display.py:11125-11183
/gnuradio/branches/developers/jcorgan/cpphier/gr-qtgui/src/python/usrp_display.py:10818-10858
/gnuradio/branches/developers/jcorgan/deb/gr-qtgui/src/python/usrp_display.py:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/branches/developers/jcorgan/t161/gr-qtgui/src/python/usrp_display.py:10876-10880
/gnuradio/branches/developers/trondeau/qtdigital/gr-qtgui/src/python/usrp_display.py:11210-11215
/gnuradio/trunk/gr-qtgui/src/python/usrp_display.py:10400,10826,10853,10859,10861-10862,10864-10865,10869,10871-10872,10877-10878,10881,10884,10890,10907-10908,10919-10923,10925,10932,10941-10944,10946-10947,10958,10969-10970,10972,10974-10975,10978-10981,10992,10998-11001,11014,11018,11027,11029-11033,11043,11047,11050,11062-11063,11072,11078,11080-11082,11084-11091,11099,11101,11106,11109,11111-11112,11115-11122,11130,11160-11173,11175,11182,11184-11185,11200,11209,11216,11224-11231,11239-11241,11254,11261
   + 
/gnuradio/branches/developers/eb/t364/gr-qtgui/src/python/usrp_display.py:11016-11017
/gnuradio/branches/developers/eb/t367/gr-qtgui/src/python/usrp_display.py:11021-11025
/gnuradio/branches/developers/eb/t371/gr-qtgui/src/python/usrp_display.py:10958-10971
/gnuradio/branches/developers/jblum/wxgui/gr-qtgui/src/python/usrp_display.py:11125-11183
/gnuradio/branches/developers/jcorgan/cpphier/gr-qtgui/src/python/usrp_display.py:10818-10858
/gnuradio/branches/developers/jcorgan/deb/gr-qtgui/src/python/usrp_display.py:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/branches/developers/jcorgan/t161/gr-qtgui/src/python/usrp_display.py:10876-10880
/gnuradio/branches/developers/trondeau/qtdigital/gr-qtgui/src/python/usrp_display.py:11210-11215
/gnuradio/trunk/gr-qtgui/src/python/usrp_display.py:10400,10826,10853,10859,10861-10862,10864-10865,10869,10871-10872,10877-10878,10881,10884,10890,10907-10908,10919-10923,10925,10932,10941-10944,10946-10947,10958,10969-10970,10972,10974-10975,10978-10981,10992,10998-11001,11014,11018,11027,11029-11033,11043,11047,11050,11062-11063,11072,11078,11080-11082,11084-11091,11099,11101,11106,11109,11111-11112,11115-11122,11130,11160-11173,11175,11182,11184-11185,11200,11209,11216,11224-11231,11239-11241,11254,11261,11265-11271

Modified: gnuradio/branches/releases/3.2/gr-usrp/apps/usrp_siggen.cc
===================================================================
--- gnuradio/branches/releases/3.2/gr-usrp/apps/usrp_siggen.cc  2009-06-28 
20:32:51 UTC (rev 11300)
+++ gnuradio/branches/releases/3.2/gr-usrp/apps/usrp_siggen.cc  2009-06-28 
20:38:07 UTC (rev 11301)
@@ -25,6 +25,7 @@
 #include <gr_noise_type.h>
 #include <stdexcept>
 #include <iostream>
+#include <cstdio>
 #include <boost/program_options.hpp>
 
 namespace po = boost::program_options;

Modified: gnuradio/branches/releases/3.2/gr-usrp/src/usrp_sink_base.cc
===================================================================
--- gnuradio/branches/releases/3.2/gr-usrp/src/usrp_sink_base.cc        
2009-06-28 20:32:51 UTC (rev 11300)
+++ gnuradio/branches/releases/3.2/gr-usrp/src/usrp_sink_base.cc        
2009-06-28 20:38:07 UTC (rev 11301)
@@ -28,6 +28,7 @@
 #include <gr_io_signature.h>
 #include <usrp_standard.h>
 #include <assert.h>
+#include <cstdio>
 
 static const int OUTPUT_MULTIPLE_SAMPLES = 128;                // DON'T CHANGE 
THIS VALUE!
 

Modified: gnuradio/branches/releases/3.2/gr-usrp/src/usrp_source_base.cc
===================================================================
--- gnuradio/branches/releases/3.2/gr-usrp/src/usrp_source_base.cc      
2009-06-28 20:32:51 UTC (rev 11300)
+++ gnuradio/branches/releases/3.2/gr-usrp/src/usrp_source_base.cc      
2009-06-28 20:38:07 UTC (rev 11301)
@@ -28,6 +28,7 @@
 #include <gr_io_signature.h>
 #include <usrp_standard.h>
 #include <assert.h>
+#include <cstdio>
 
 static const int OUTPUT_MULTIPLE_BYTES = 4 * 1024;
 


Property changes on: 
gnuradio/branches/releases/3.2/gr-wxgui/src/python/forms/forms.py
___________________________________________________________________
Modified: svn:mergeinfo
   - 
/gnuradio/trunk/gr-wxgui/src/python/forms/forms.py:11185,11200,11209,11216,11224-11231,11239-11241,11254,11261
   + 
/gnuradio/trunk/gr-wxgui/src/python/forms/forms.py:11185,11200,11209,11216,11224-11231,11239-11241,11254,11261,11265-11271


Property changes on: 
gnuradio/branches/releases/3.2/gr-wxgui/src/python/plotter/grid_plotter_base.py
___________________________________________________________________
Modified: svn:mergeinfo
   - 
/gnuradio/branches/developers/eb/t364/gr-wxgui/src/python/plotter/grid_plotter_base.py:11016-11017
/gnuradio/branches/developers/eb/t367/gr-wxgui/src/python/plotter/grid_plotter_base.py:11021-11025
/gnuradio/branches/developers/eb/t371/gr-wxgui/src/python/plotter/grid_plotter_base.py:10958-10971
/gnuradio/branches/developers/eb/t378/gr-wxgui/src/python/plotter/grid_plotter_base.py:10683-10688
/gnuradio/branches/developers/jblum/grc/gr-wxgui/src/python/plotter/grid_plotter_base.py:10680-10938
/gnuradio/branches/developers/jblum/vlen/gr-wxgui/src/python/plotter/grid_plotter_base.py:10667-10677
/gnuradio/branches/developers/jblum/wxgui/gr-wxgui/src/python/plotter/grid_plotter_base.py:11125-11183
/gnuradio/branches/developers/jcorgan/cpphier/gr-wxgui/src/python/plotter/grid_plotter_base.py:10818-10858
/gnuradio/branches/developers/jcorgan/deb/gr-wxgui/src/python/plotter/grid_plotter_base.py:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/branches/developers/jcorgan/gpio2/gr-wxgui/src/python/plotter/grid_plotter_base.py:10713-10765
/gnuradio/branches/developers/jcorgan/t161/gr-wxgui/src/python/plotter/grid_plotter_base.py:10876-10880
/gnuradio/trunk/gr-wxgui/src/python/plotter/grid_plotter_base.py:10400,10673,10678,10681,10686,10689,10691,10701-10702,10707-10710,10714-10721,10725,10728-10736,10739-10751,10759-10762,10766,10768-10769,10778-10779,10787-10789,10793,10826,10847-10848,10850,10852-10853,10859,10861-10862,10864-10865,10869,10871-10872,10877-10878,10881,10884,10890,10907-10908,10919-10923,10925,10932,10941-10944,10946-10947,10958,10969-10970,10972,10974-10975,10978-10981,10992,10998-11001,11014,11018,11027,11029-11033,11043,11047,11050,11062-11063,11072,11078,11080-11082,11084-11091,11099,11101,11106,11109,11111-11112,11115-11122,11130,11160-11173,11175,11182,11184-11185,11200,11209,11216,11224-11231,11239-11241,11254,11261
   + 
/gnuradio/branches/developers/eb/t364/gr-wxgui/src/python/plotter/grid_plotter_base.py:11016-11017
/gnuradio/branches/developers/eb/t367/gr-wxgui/src/python/plotter/grid_plotter_base.py:11021-11025
/gnuradio/branches/developers/eb/t371/gr-wxgui/src/python/plotter/grid_plotter_base.py:10958-10971
/gnuradio/branches/developers/eb/t378/gr-wxgui/src/python/plotter/grid_plotter_base.py:10683-10688
/gnuradio/branches/developers/jblum/grc/gr-wxgui/src/python/plotter/grid_plotter_base.py:10680-10938
/gnuradio/branches/developers/jblum/vlen/gr-wxgui/src/python/plotter/grid_plotter_base.py:10667-10677
/gnuradio/branches/developers/jblum/wxgui/gr-wxgui/src/python/plotter/grid_plotter_base.py:11125-11183
/gnuradio/branches/developers/jcorgan/cpphier/gr-wxgui/src/python/plotter/grid_plotter_base.py:10818-10858
/gnuradio/branches/developers/jcorgan/deb/gr-wxgui/src/python/plotter/grid_plotter_base.py:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/branches/developers/jcorgan/gpio2/gr-wxgui/src/python/plotter/grid_plotter_base.py:10713-10765
/gnuradio/branches/developers/jcorgan/t161/gr-wxgui/src/python/plotter/grid_plotter_base.py:10876-10880
/gnuradio/trunk/gr-wxgui/src/python/plotter/grid_plotter_base.py:10400,10673,10678,10681,10686,10689,10691,10701-10702,10707-10710,10714-10721,10725,10728-10736,10739-10751,10759-10762,10766,10768-10769,10778-10779,10787-10789,10793,10826,10847-10848,10850,10852-10853,10859,10861-10862,10864-10865,10869,10871-10872,10877-10878,10881,10884,10890,10907-10908,10919-10923,10925,10932,10941-10944,10946-10947,10958,10969-10970,10972,10974-10975,10978-10981,10992,10998-11001,11014,11018,11027,11029-11033,11043,11047,11050,11062-11063,11072,11078,11080-11082,11084-11091,11099,11101,11106,11109,11111-11112,11115-11122,11130,11160-11173,11175,11182,11184-11185,11200,11209,11216,11224-11231,11239-11241,11254,11261,11265-11271


Property changes on: 
gnuradio/branches/releases/3.2/grc/data/platforms/python/blocks/blks2_tcp_sink.xml
___________________________________________________________________
Modified: svn:mergeinfo
   - 
/gnuradio/branches/developers/eb/t348/grc/data/platforms/python/blocks/gr_udp_sink.xml:10638-10648
/gnuradio/branches/developers/eb/t364/grc/data/platforms/python/blocks/gr_udp_sink.xml:11016-11017
/gnuradio/branches/developers/eb/t367/grc/data/platforms/python/blocks/gr_udp_sink.xml:11021-11025
/gnuradio/branches/developers/eb/t371/grc/data/platforms/python/blocks/gr_udp_sink.xml:10958-10971
/gnuradio/branches/developers/eb/t378/grc/data/platforms/python/blocks/gr_udp_sink.xml:10683-10688
/gnuradio/branches/developers/jblum/grc/grc/data/platforms/python/blocks/gr_udp_sink.xml:10680-10938
/gnuradio/branches/developers/jblum/gui_guts/grc/data/platforms/python/blocks/gr_udp_sink.xml:10464-10658
/gnuradio/branches/developers/jblum/vlen/grc/data/platforms/python/blocks/gr_udp_sink.xml:10667-10677
/gnuradio/branches/developers/jblum/wxgui/grc/data/platforms/python/blocks/blks2_tcp_sink.xml:11125-11183
/gnuradio/branches/developers/jcorgan/cpphier/grc/data/platforms/python/blocks/gr_udp_sink.xml:10818-10858
/gnuradio/branches/developers/jcorgan/deb/grc/data/platforms/python/blocks/blks2_tcp_sink.xml:11075-11077
/gnuradio/branches/developers/jcorgan/deb/grc/data/platforms/python/blocks/gr_udp_sink.xml:10949-10959,11013-11022
/gnuradio/branches/developers/jcorgan/fw-optimize/grc/data/platforms/python/blocks/gr_udp_sink.xml:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/grc/data/platforms/python/blocks/gr_udp_sink.xml:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/grc/data/platforms/python/blocks/gr_udp_sink.xml:10771-10887
/gnuradio/branches/developers/jcorgan/t161/grc/data/platforms/python/blocks/gr_udp_sink.xml:10876-10880
/gnuradio/branches/developers/michaelld/am_swig_4/grc/data/platforms/python/blocks/gr_udp_sink.xml:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/grc/data/platforms/python/blocks/gr_udp_sink.xml:10540-10546
/gnuradio/trunk/grc/data/platforms/python/blocks/blks2_tcp_sink.xml:10400,11043,11047,11050,11072,11078,11080-11082,11084-11091,11099,11101,11106,11109,11111-11112,11115-11122,11130,11160-11173,11175,11182,11184-11185,11200,11209,11216,11224-11231,11239-11241,11254,11261
   + 
/gnuradio/branches/developers/eb/t348/grc/data/platforms/python/blocks/gr_udp_sink.xml:10638-10648
/gnuradio/branches/developers/eb/t364/grc/data/platforms/python/blocks/gr_udp_sink.xml:11016-11017
/gnuradio/branches/developers/eb/t367/grc/data/platforms/python/blocks/gr_udp_sink.xml:11021-11025
/gnuradio/branches/developers/eb/t371/grc/data/platforms/python/blocks/gr_udp_sink.xml:10958-10971
/gnuradio/branches/developers/eb/t378/grc/data/platforms/python/blocks/gr_udp_sink.xml:10683-10688
/gnuradio/branches/developers/jblum/grc/grc/data/platforms/python/blocks/gr_udp_sink.xml:10680-10938
/gnuradio/branches/developers/jblum/gui_guts/grc/data/platforms/python/blocks/gr_udp_sink.xml:10464-10658
/gnuradio/branches/developers/jblum/vlen/grc/data/platforms/python/blocks/gr_udp_sink.xml:10667-10677
/gnuradio/branches/developers/jblum/wxgui/grc/data/platforms/python/blocks/blks2_tcp_sink.xml:11125-11183
/gnuradio/branches/developers/jcorgan/cpphier/grc/data/platforms/python/blocks/gr_udp_sink.xml:10818-10858
/gnuradio/branches/developers/jcorgan/deb/grc/data/platforms/python/blocks/blks2_tcp_sink.xml:11075-11077
/gnuradio/branches/developers/jcorgan/deb/grc/data/platforms/python/blocks/gr_udp_sink.xml:10949-10959,11013-11022
/gnuradio/branches/developers/jcorgan/fw-optimize/grc/data/platforms/python/blocks/gr_udp_sink.xml:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/grc/data/platforms/python/blocks/gr_udp_sink.xml:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/grc/data/platforms/python/blocks/gr_udp_sink.xml:10771-10887
/gnuradio/branches/developers/jcorgan/t161/grc/data/platforms/python/blocks/gr_udp_sink.xml:10876-10880
/gnuradio/branches/developers/michaelld/am_swig_4/grc/data/platforms/python/blocks/gr_udp_sink.xml:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/grc/data/platforms/python/blocks/gr_udp_sink.xml:10540-10546
/gnuradio/trunk/grc/data/platforms/python/blocks/blks2_tcp_sink.xml:10400,11043,11047,11050,11072,11078,11080-11082,11084-11091,11099,11101,11106,11109,11111-11112,11115-11122,11130,11160-11173,11175,11182,11184-11185,11200,11209,11216,11224-11231,11239-11241,11254,11261,11265-11271


Property changes on: 
gnuradio/branches/releases/3.2/grc/data/platforms/python/blocks/blks2_tcp_source.xml
___________________________________________________________________
Modified: svn:mergeinfo
   - 
/gnuradio/branches/developers/eb/t348/grc/data/platforms/python/blocks/gr_udp_source.xml:10638-10648
/gnuradio/branches/developers/eb/t364/grc/data/platforms/python/blocks/gr_udp_source.xml:11016-11017
/gnuradio/branches/developers/eb/t367/grc/data/platforms/python/blocks/gr_udp_source.xml:11021-11025
/gnuradio/branches/developers/eb/t371/grc/data/platforms/python/blocks/gr_udp_source.xml:10958-10971
/gnuradio/branches/developers/eb/t378/grc/data/platforms/python/blocks/gr_udp_source.xml:10683-10688
/gnuradio/branches/developers/jblum/grc/grc/data/platforms/python/blocks/gr_udp_source.xml:10680-10938
/gnuradio/branches/developers/jblum/gui_guts/grc/data/platforms/python/blocks/gr_udp_source.xml:10464-10658
/gnuradio/branches/developers/jblum/vlen/grc/data/platforms/python/blocks/gr_udp_source.xml:10667-10677
/gnuradio/branches/developers/jblum/wxgui/grc/data/platforms/python/blocks/blks2_tcp_source.xml:11125-11183
/gnuradio/branches/developers/jcorgan/cpphier/grc/data/platforms/python/blocks/gr_udp_source.xml:10818-10858
/gnuradio/branches/developers/jcorgan/deb/grc/data/platforms/python/blocks/blks2_tcp_source.xml:11075-11077
/gnuradio/branches/developers/jcorgan/deb/grc/data/platforms/python/blocks/gr_udp_source.xml:10949-10959,11013-11022
/gnuradio/branches/developers/jcorgan/fw-optimize/grc/data/platforms/python/blocks/gr_udp_source.xml:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/grc/data/platforms/python/blocks/gr_udp_source.xml:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/grc/data/platforms/python/blocks/gr_udp_source.xml:10771-10887
/gnuradio/branches/developers/jcorgan/t161/grc/data/platforms/python/blocks/gr_udp_source.xml:10876-10880
/gnuradio/branches/developers/michaelld/am_swig_4/grc/data/platforms/python/blocks/gr_udp_source.xml:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/grc/data/platforms/python/blocks/gr_udp_source.xml:10540-10546
/gnuradio/trunk/grc/data/platforms/python/blocks/blks2_tcp_source.xml:10400,11043,11047,11050,11072,11078,11080-11082,11084-11091,11099,11101,11106,11109,11111-11112,11115-11122,11130,11160-11173,11175,11182,11184-11185,11200,11209,11216,11224-11231,11239-11241,11254,11261
   + 
/gnuradio/branches/developers/eb/t348/grc/data/platforms/python/blocks/gr_udp_source.xml:10638-10648
/gnuradio/branches/developers/eb/t364/grc/data/platforms/python/blocks/gr_udp_source.xml:11016-11017
/gnuradio/branches/developers/eb/t367/grc/data/platforms/python/blocks/gr_udp_source.xml:11021-11025
/gnuradio/branches/developers/eb/t371/grc/data/platforms/python/blocks/gr_udp_source.xml:10958-10971
/gnuradio/branches/developers/eb/t378/grc/data/platforms/python/blocks/gr_udp_source.xml:10683-10688
/gnuradio/branches/developers/jblum/grc/grc/data/platforms/python/blocks/gr_udp_source.xml:10680-10938
/gnuradio/branches/developers/jblum/gui_guts/grc/data/platforms/python/blocks/gr_udp_source.xml:10464-10658
/gnuradio/branches/developers/jblum/vlen/grc/data/platforms/python/blocks/gr_udp_source.xml:10667-10677
/gnuradio/branches/developers/jblum/wxgui/grc/data/platforms/python/blocks/blks2_tcp_source.xml:11125-11183
/gnuradio/branches/developers/jcorgan/cpphier/grc/data/platforms/python/blocks/gr_udp_source.xml:10818-10858
/gnuradio/branches/developers/jcorgan/deb/grc/data/platforms/python/blocks/blks2_tcp_source.xml:11075-11077
/gnuradio/branches/developers/jcorgan/deb/grc/data/platforms/python/blocks/gr_udp_source.xml:10949-10959,11013-11022
/gnuradio/branches/developers/jcorgan/fw-optimize/grc/data/platforms/python/blocks/gr_udp_source.xml:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/grc/data/platforms/python/blocks/gr_udp_source.xml:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/grc/data/platforms/python/blocks/gr_udp_source.xml:10771-10887
/gnuradio/branches/developers/jcorgan/t161/grc/data/platforms/python/blocks/gr_udp_source.xml:10876-10880
/gnuradio/branches/developers/michaelld/am_swig_4/grc/data/platforms/python/blocks/gr_udp_source.xml:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/grc/data/platforms/python/blocks/gr_udp_source.xml:10540-10546
/gnuradio/trunk/grc/data/platforms/python/blocks/blks2_tcp_source.xml:10400,11043,11047,11050,11072,11078,11080-11082,11084-11091,11099,11101,11106,11109,11111-11112,11115-11122,11130,11160-11173,11175,11182,11184-11185,11200,11209,11216,11224-11231,11239-11241,11254,11261,11265-11271


Property changes on: 
gnuradio/branches/releases/3.2/grc/data/platforms/python/blocks/blks2_variable_sink_x.xml
___________________________________________________________________
Modified: svn:mergeinfo
   - 
/gnuradio/branches/developers/eb/t348/grc/data/platforms/python/blocks/variable_sink.xml:10638-10648
/gnuradio/branches/developers/eb/t364/grc/data/platforms/python/blocks/variable_sink.xml:11016-11017
/gnuradio/branches/developers/eb/t367/grc/data/platforms/python/blocks/variable_sink.xml:11021-11025
/gnuradio/branches/developers/eb/t371/grc/data/platforms/python/blocks/variable_sink.xml:10958-10971
/gnuradio/branches/developers/eb/t378/grc/data/platforms/python/blocks/variable_sink.xml:10683-10688
/gnuradio/branches/developers/jblum/grc/grc/data/platforms/python/blocks/variable_sink.xml:10680-10938
/gnuradio/branches/developers/jblum/gui_guts/grc/data/platforms/python/blocks/variable_sink.xml:10464-10658
/gnuradio/branches/developers/jblum/vlen/grc/data/platforms/python/blocks/variable_sink.xml:10667-10677
/gnuradio/branches/developers/jblum/wxgui/grc/data/platforms/python/blocks/blks2_variable_sink_x.xml:11125-11183
/gnuradio/branches/developers/jcorgan/cpphier/grc/data/platforms/python/blocks/variable_sink.xml:10818-10858
/gnuradio/branches/developers/jcorgan/deb/grc/data/platforms/python/blocks/blks2_variable_sink_x.xml:11075-11077
/gnuradio/branches/developers/jcorgan/deb/grc/data/platforms/python/blocks/variable_sink.xml:10949-10959,11013-11022
/gnuradio/branches/developers/jcorgan/fw-optimize/grc/data/platforms/python/blocks/variable_sink.xml:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/grc/data/platforms/python/blocks/variable_sink.xml:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/grc/data/platforms/python/blocks/variable_sink.xml:10771-10887
/gnuradio/branches/developers/jcorgan/t161/grc/data/platforms/python/blocks/variable_sink.xml:10876-10880
/gnuradio/branches/developers/michaelld/am_swig_4/grc/data/platforms/python/blocks/variable_sink.xml:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/grc/data/platforms/python/blocks/variable_sink.xml:10540-10546
/gnuradio/trunk/grc/data/platforms/python/blocks/blks2_variable_sink_x.xml:10400,11043,11047,11050,11072,11078,11080-11082,11084-11091,11099,11101,11106,11109,11111-11112,11115-11122,11130,11160-11173,11175,11182,11184-11185,11200,11209,11216,11224-11231,11239-11241,11254,11261
   + 
/gnuradio/branches/developers/eb/t348/grc/data/platforms/python/blocks/variable_sink.xml:10638-10648
/gnuradio/branches/developers/eb/t364/grc/data/platforms/python/blocks/variable_sink.xml:11016-11017
/gnuradio/branches/developers/eb/t367/grc/data/platforms/python/blocks/variable_sink.xml:11021-11025
/gnuradio/branches/developers/eb/t371/grc/data/platforms/python/blocks/variable_sink.xml:10958-10971
/gnuradio/branches/developers/eb/t378/grc/data/platforms/python/blocks/variable_sink.xml:10683-10688
/gnuradio/branches/developers/jblum/grc/grc/data/platforms/python/blocks/variable_sink.xml:10680-10938
/gnuradio/branches/developers/jblum/gui_guts/grc/data/platforms/python/blocks/variable_sink.xml:10464-10658
/gnuradio/branches/developers/jblum/vlen/grc/data/platforms/python/blocks/variable_sink.xml:10667-10677
/gnuradio/branches/developers/jblum/wxgui/grc/data/platforms/python/blocks/blks2_variable_sink_x.xml:11125-11183
/gnuradio/branches/developers/jcorgan/cpphier/grc/data/platforms/python/blocks/variable_sink.xml:10818-10858
/gnuradio/branches/developers/jcorgan/deb/grc/data/platforms/python/blocks/blks2_variable_sink_x.xml:11075-11077
/gnuradio/branches/developers/jcorgan/deb/grc/data/platforms/python/blocks/variable_sink.xml:10949-10959,11013-11022
/gnuradio/branches/developers/jcorgan/fw-optimize/grc/data/platforms/python/blocks/variable_sink.xml:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/grc/data/platforms/python/blocks/variable_sink.xml:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/grc/data/platforms/python/blocks/variable_sink.xml:10771-10887
/gnuradio/branches/developers/jcorgan/t161/grc/data/platforms/python/blocks/variable_sink.xml:10876-10880
/gnuradio/branches/developers/michaelld/am_swig_4/grc/data/platforms/python/blocks/variable_sink.xml:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/grc/data/platforms/python/blocks/variable_sink.xml:10540-10546
/gnuradio/trunk/grc/data/platforms/python/blocks/blks2_variable_sink_x.xml:10400,11043,11047,11050,11072,11078,11080-11082,11084-11091,11099,11101,11106,11109,11111-11112,11115-11122,11130,11160-11173,11175,11182,11184-11185,11200,11209,11216,11224-11231,11239-11241,11254,11261,11265-11271


Property changes on: 
gnuradio/branches/releases/3.2/grc/data/platforms/python/blocks/gr_add_xx.xml
___________________________________________________________________
Modified: svn:mergeinfo
   - 
/gnuradio/branches/developers/eb/t348/grc/data/platforms/python/blocks/gr_add_vxx.xml:10638-10648
/gnuradio/branches/developers/eb/t364/grc/data/platforms/python/blocks/gr_add_xx.xml:11016-11017
/gnuradio/branches/developers/eb/t367/grc/data/platforms/python/blocks/gr_add_xx.xml:11021-11025
/gnuradio/branches/developers/eb/t371/grc/data/platforms/python/blocks/gr_add_xx.xml:10958-10971
/gnuradio/branches/developers/eb/t378/grc/data/platforms/python/blocks/gr_add_xx.xml:10683-10688
/gnuradio/branches/developers/jblum/grc/grc/data/platforms/python/blocks/gr_add_xx.xml:10680-10938
/gnuradio/branches/developers/jblum/gui_guts/grc/data/platforms/python/blocks/gr_add_vxx.xml:10464-10658
/gnuradio/branches/developers/jblum/wxgui/grc/data/platforms/python/blocks/gr_add_xx.xml:11125-11183
/gnuradio/branches/developers/jcorgan/cpphier/grc/data/platforms/python/blocks/gr_add_xx.xml:10818-10858
/gnuradio/branches/developers/jcorgan/deb/grc/data/platforms/python/blocks/gr_add_xx.xml:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/branches/developers/jcorgan/gpio2/grc/data/platforms/python/blocks/gr_add_xx.xml:10713-10765
/gnuradio/branches/developers/jcorgan/t161/grc/data/platforms/python/blocks/gr_add_xx.xml:10876-10880
/gnuradio/branches/developers/michaelld/am_swig_4/grc/data/platforms/python/blocks/gr_add_vxx.xml:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/grc/data/platforms/python/blocks/gr_add_vxx.xml:10540-10546
/gnuradio/trunk/grc/data/platforms/python/blocks/gr_add_xx.xml:10400,10681,10686,10689,10691,10701-10702,10707-10710,10714-10721,10725,10728-10736,10739-10751,10759-10762,10766,10768-10769,10778-10779,10787-10789,10793,10826,10847-10848,10850,10852-10853,10859,10861-10862,10864-10865,10869,10871-10872,10877-10878,10881,10884,10890,10907-10908,10919-10923,10925,10932,10941-10944,10946-10947,10958,10969-10970,10972,10974-10975,10978-10981,10992,10998-11001,11014,11018,11027,11029-11033,11043,11047,11050,11062-11063,11072,11078,11080-11082,11084-11091,11099,11101,11106,11109,11111-11112,11115-11122,11130,11160-11173,11175,11182,11184-11185,11200,11209,11216,11224-11231,11239-11241,11254,11261
   + 
/gnuradio/branches/developers/eb/t348/grc/data/platforms/python/blocks/gr_add_vxx.xml:10638-10648
/gnuradio/branches/developers/eb/t364/grc/data/platforms/python/blocks/gr_add_xx.xml:11016-11017
/gnuradio/branches/developers/eb/t367/grc/data/platforms/python/blocks/gr_add_xx.xml:11021-11025
/gnuradio/branches/developers/eb/t371/grc/data/platforms/python/blocks/gr_add_xx.xml:10958-10971
/gnuradio/branches/developers/eb/t378/grc/data/platforms/python/blocks/gr_add_xx.xml:10683-10688
/gnuradio/branches/developers/jblum/grc/grc/data/platforms/python/blocks/gr_add_xx.xml:10680-10938
/gnuradio/branches/developers/jblum/gui_guts/grc/data/platforms/python/blocks/gr_add_vxx.xml:10464-10658
/gnuradio/branches/developers/jblum/wxgui/grc/data/platforms/python/blocks/gr_add_xx.xml:11125-11183
/gnuradio/branches/developers/jcorgan/cpphier/grc/data/platforms/python/blocks/gr_add_xx.xml:10818-10858
/gnuradio/branches/developers/jcorgan/deb/grc/data/platforms/python/blocks/gr_add_xx.xml:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/branches/developers/jcorgan/gpio2/grc/data/platforms/python/blocks/gr_add_xx.xml:10713-10765
/gnuradio/branches/developers/jcorgan/t161/grc/data/platforms/python/blocks/gr_add_xx.xml:10876-10880
/gnuradio/branches/developers/michaelld/am_swig_4/grc/data/platforms/python/blocks/gr_add_vxx.xml:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/grc/data/platforms/python/blocks/gr_add_vxx.xml:10540-10546
/gnuradio/trunk/grc/data/platforms/python/blocks/gr_add_xx.xml:10400,10681,10686,10689,10691,10701-10702,10707-10710,10714-10721,10725,10728-10736,10739-10751,10759-10762,10766,10768-10769,10778-10779,10787-10789,10793,10826,10847-10848,10850,10852-10853,10859,10861-10862,10864-10865,10869,10871-10872,10877-10878,10881,10884,10890,10907-10908,10919-10923,10925,10932,10941-10944,10946-10947,10958,10969-10970,10972,10974-10975,10978-10981,10992,10998-11001,11014,11018,11027,11029-11033,11043,11047,11050,11062-11063,11072,11078,11080-11082,11084-11091,11099,11101,11106,11109,11111-11112,11115-11122,11130,11160-11173,11175,11182,11184-11185,11200,11209,11216,11224-11231,11239-11241,11254,11261,11265-11271


Property changes on: 
gnuradio/branches/releases/3.2/grc/data/platforms/python/blocks/gr_channel_model.xml
___________________________________________________________________
Modified: svn:mergeinfo
   - 
/gnuradio/branches/developers/eb/t348/grc/data/platforms/python/blocks/blks2_channel_model.xml:10638-10648
/gnuradio/branches/developers/eb/t364/grc/data/platforms/python/blocks/gr_channel_model.xml:11016-11017
/gnuradio/branches/developers/eb/t367/grc/data/platforms/python/blocks/gr_channel_model.xml:11021-11025
/gnuradio/branches/developers/eb/t371/grc/data/platforms/python/blocks/gr_channel_model.xml:10958-10971
/gnuradio/branches/developers/eb/t378/grc/data/platforms/python/blocks/blks2_channel_model.xml:10683-10688
/gnuradio/branches/developers/jblum/gui_guts/grc/data/platforms/python/blocks/blks2_channel_model.xml:10464-10658
/gnuradio/branches/developers/jblum/vlen/grc/data/platforms/python/blocks/blks2_channel_model.xml:10667-10677
/gnuradio/branches/developers/jblum/wxgui/grc/data/platforms/python/blocks/gr_channel_model.xml:11125-11183
/gnuradio/branches/developers/jcorgan/cpphier/grc/data/platforms/python/blocks/blks2_channel_model.xml:10818-10858
/gnuradio/branches/developers/jcorgan/deb/grc/data/platforms/python/blocks/gr_channel_model.xml:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/branches/developers/jcorgan/fw-optimize/grc/data/platforms/python/blocks/blks2_channel_model.xml:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/grc/data/platforms/python/blocks/blks2_channel_model.xml:10713-10765
/gnuradio/branches/developers/jcorgan/t161/grc/data/platforms/python/blocks/gr_channel_model.xml:10876-10880
/gnuradio/branches/developers/michaelld/am_swig_4/grc/data/platforms/python/blocks/blks2_channel_model.xml:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/grc/data/platforms/python/blocks/blks2_channel_model.xml:10540-10546
/gnuradio/trunk/grc/data/platforms/python/blocks/gr_channel_model.xml:10400,10826,10853,10864-10865,10869,10871-10872,10877-10878,10881,10884,10890,10907-10908,10919-10923,10925,10932,10941-10944,10946-10947,10958,10969-10970,10972,10974-10975,10978-10981,10992,10998-11001,11014,11018,11027,11029-11033,11043,11047,11050,11062-11063,11072,11078,11080-11082,11084-11091,11099,11101,11106,11109,11111-11112,11115-11122,11130,11160-11173,11175,11182,11184-11185,11200,11209,11216,11224-11231,11239-11241,11254,11261
   + 
/gnuradio/branches/developers/eb/t348/grc/data/platforms/python/blocks/blks2_channel_model.xml:10638-10648
/gnuradio/branches/developers/eb/t364/grc/data/platforms/python/blocks/gr_channel_model.xml:11016-11017
/gnuradio/branches/developers/eb/t367/grc/data/platforms/python/blocks/gr_channel_model.xml:11021-11025
/gnuradio/branches/developers/eb/t371/grc/data/platforms/python/blocks/gr_channel_model.xml:10958-10971
/gnuradio/branches/developers/eb/t378/grc/data/platforms/python/blocks/blks2_channel_model.xml:10683-10688
/gnuradio/branches/developers/jblum/gui_guts/grc/data/platforms/python/blocks/blks2_channel_model.xml:10464-10658
/gnuradio/branches/developers/jblum/vlen/grc/data/platforms/python/blocks/blks2_channel_model.xml:10667-10677
/gnuradio/branches/developers/jblum/wxgui/grc/data/platforms/python/blocks/gr_channel_model.xml:11125-11183
/gnuradio/branches/developers/jcorgan/cpphier/grc/data/platforms/python/blocks/blks2_channel_model.xml:10818-10858
/gnuradio/branches/developers/jcorgan/deb/grc/data/platforms/python/blocks/gr_channel_model.xml:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/branches/developers/jcorgan/fw-optimize/grc/data/platforms/python/blocks/blks2_channel_model.xml:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/grc/data/platforms/python/blocks/blks2_channel_model.xml:10713-10765
/gnuradio/branches/developers/jcorgan/t161/grc/data/platforms/python/blocks/gr_channel_model.xml:10876-10880
/gnuradio/branches/developers/michaelld/am_swig_4/grc/data/platforms/python/blocks/blks2_channel_model.xml:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/grc/data/platforms/python/blocks/blks2_channel_model.xml:10540-10546
/gnuradio/trunk/grc/data/platforms/python/blocks/gr_channel_model.xml:10400,10826,10853,10864-10865,10869,10871-10872,10877-10878,10881,10884,10890,10907-10908,10919-10923,10925,10932,10941-10944,10946-10947,10958,10969-10970,10972,10974-10975,10978-10981,10992,10998-11001,11014,11018,11027,11029-11033,11043,11047,11050,11062-11063,11072,11078,11080-11082,11084-11091,11099,11101,11106,11109,11111-11112,11115-11122,11130,11160-11173,11175,11182,11184-11185,11200,11209,11216,11224-11231,11239-11241,11254,11261,11265-11271


Property changes on: 
gnuradio/branches/releases/3.2/grc/data/platforms/python/blocks/gr_multiply_xx.xml
___________________________________________________________________
Modified: svn:mergeinfo
   - 
/gnuradio/branches/developers/eb/t348/grc/data/platforms/python/blocks/gr_multiply_vxx.xml:10638-10648
/gnuradio/branches/developers/eb/t364/grc/data/platforms/python/blocks/gr_multiply_xx.xml:11016-11017
/gnuradio/branches/developers/eb/t367/grc/data/platforms/python/blocks/gr_multiply_xx.xml:11021-11025
/gnuradio/branches/developers/eb/t371/grc/data/platforms/python/blocks/gr_multiply_xx.xml:10958-10971
/gnuradio/branches/developers/eb/t378/grc/data/platforms/python/blocks/gr_multiply_xx.xml:10683-10688
/gnuradio/branches/developers/jblum/grc/grc/data/platforms/python/blocks/gr_multiply_xx.xml:10680-10938
/gnuradio/branches/developers/jblum/gui_guts/grc/data/platforms/python/blocks/gr_multiply_vxx.xml:10464-10658
/gnuradio/branches/developers/jblum/wxgui/grc/data/platforms/python/blocks/gr_multiply_xx.xml:11125-11183
/gnuradio/branches/developers/jcorgan/cpphier/grc/data/platforms/python/blocks/gr_multiply_xx.xml:10818-10858
/gnuradio/branches/developers/jcorgan/deb/grc/data/platforms/python/blocks/gr_multiply_xx.xml:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/branches/developers/jcorgan/gpio2/grc/data/platforms/python/blocks/gr_multiply_xx.xml:10713-10765
/gnuradio/branches/developers/jcorgan/t161/grc/data/platforms/python/blocks/gr_multiply_xx.xml:10876-10880
/gnuradio/branches/developers/michaelld/am_swig_4/grc/data/platforms/python/blocks/gr_multiply_vxx.xml:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/grc/data/platforms/python/blocks/gr_multiply_vxx.xml:10540-10546
/gnuradio/trunk/grc/data/platforms/python/blocks/gr_multiply_xx.xml:10400,10681,10686,10689,10691,10701-10702,10707-10710,10714-10721,10725,10728-10736,10739-10751,10759-10762,10766,10768-10769,10778-10779,10787-10789,10793,10826,10847-10848,10850,10852-10853,10859,10861-10862,10864-10865,10869,10871-10872,10877-10878,10881,10884,10890,10907-10908,10919-10923,10925,10932,10941-10944,10946-10947,10958,10969-10970,10972,10974-10975,10978-10981,10992,10998-11001,11014,11018,11027,11029-11033,11043,11047,11050,11062-11063,11072,11078,11080-11082,11084-11091,11099,11101,11106,11109,11111-11112,11115-11122,11130,11160-11173,11175,11182,11184-11185,11200,11209,11216,11224-11231,11239-11241,11254,11261
   + 
/gnuradio/branches/developers/eb/t348/grc/data/platforms/python/blocks/gr_multiply_vxx.xml:10638-10648
/gnuradio/branches/developers/eb/t364/grc/data/platforms/python/blocks/gr_multiply_xx.xml:11016-11017
/gnuradio/branches/developers/eb/t367/grc/data/platforms/python/blocks/gr_multiply_xx.xml:11021-11025
/gnuradio/branches/developers/eb/t371/grc/data/platforms/python/blocks/gr_multiply_xx.xml:10958-10971
/gnuradio/branches/developers/eb/t378/grc/data/platforms/python/blocks/gr_multiply_xx.xml:10683-10688
/gnuradio/branches/developers/jblum/grc/grc/data/platforms/python/blocks/gr_multiply_xx.xml:10680-10938
/gnuradio/branches/developers/jblum/gui_guts/grc/data/platforms/python/blocks/gr_multiply_vxx.xml:10464-10658
/gnuradio/branches/developers/jblum/wxgui/grc/data/platforms/python/blocks/gr_multiply_xx.xml:11125-11183
/gnuradio/branches/developers/jcorgan/cpphier/grc/data/platforms/python/blocks/gr_multiply_xx.xml:10818-10858
/gnuradio/branches/developers/jcorgan/deb/grc/data/platforms/python/blocks/gr_multiply_xx.xml:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/branches/developers/jcorgan/gpio2/grc/data/platforms/python/blocks/gr_multiply_xx.xml:10713-10765
/gnuradio/branches/developers/jcorgan/t161/grc/data/platforms/python/blocks/gr_multiply_xx.xml:10876-10880
/gnuradio/branches/developers/michaelld/am_swig_4/grc/data/platforms/python/blocks/gr_multiply_vxx.xml:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/grc/data/platforms/python/blocks/gr_multiply_vxx.xml:10540-10546
/gnuradio/trunk/grc/data/platforms/python/blocks/gr_multiply_xx.xml:10400,10681,10686,10689,10691,10701-10702,10707-10710,10714-10721,10725,10728-10736,10739-10751,10759-10762,10766,10768-10769,10778-10779,10787-10789,10793,10826,10847-10848,10850,10852-10853,10859,10861-10862,10864-10865,10869,10871-10872,10877-10878,10881,10884,10890,10907-10908,10919-10923,10925,10932,10941-10944,10946-10947,10958,10969-10970,10972,10974-10975,10978-10981,10992,10998-11001,11014,11018,11027,11029-11033,11043,11047,11050,11062-11063,11072,11078,11080-11082,11084-11091,11099,11101,11106,11109,11111-11112,11115-11122,11130,11160-11173,11175,11182,11184-11185,11200,11209,11216,11224-11231,11239-11241,11254,11261,11265-11271


Property changes on: gnuradio/branches/releases/3.2/grc/src/utils/odict.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /gnuradio/branches/developers/eb/t364/grc/src/utils/odict.py:11016-11017
/gnuradio/branches/developers/eb/t367/grc/src/utils/odict.py:11021-11025
/gnuradio/branches/developers/eb/t371/grc/src/utils/odict.py:10958-10971
/gnuradio/branches/developers/jblum/wxgui/grc/src/utils/odict.py:11125-11183
/gnuradio/branches/developers/jcorgan/deb/grc/src/utils/odict.py:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/trunk/grc/src/utils/odict.py:10400,10942-10944,10946-10947,10958,10969-10970,10972,10974-10975,10978-10981,11000-11001,11014,11018,11027,11029-11033,11043,11047,11050,11062-11063,11072,11078,11080-11082,11084-11091,11099,11101,11106,11109,11111-11112,11115-11122,11130,11160-11173,11175,11182,11184-11185,11200,11209,11216,11224-11231,11239-11241,11254,11261
   + /gnuradio/branches/developers/eb/t364/grc/src/utils/odict.py:11016-11017
/gnuradio/branches/developers/eb/t367/grc/src/utils/odict.py:11021-11025
/gnuradio/branches/developers/eb/t371/grc/src/utils/odict.py:10958-10971
/gnuradio/branches/developers/jblum/wxgui/grc/src/utils/odict.py:11125-11183
/gnuradio/branches/developers/jcorgan/deb/grc/src/utils/odict.py:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/trunk/grc/src/utils/odict.py:10400,10942-10944,10946-10947,10958,10969-10970,10972,10974-10975,10978-10981,11000-11001,11014,11018,11027,11029-11033,11043,11047,11050,11062-11063,11072,11078,11080-11082,11084-11091,11099,11101,11106,11109,11111-11112,11115-11122,11130,11160-11173,11175,11182,11184-11185,11200,11209,11216,11224-11231,11239-11241,11254,11261,11265-11271

Modified: gnuradio/branches/releases/3.2/mblock/src/lib/mb_worker.cc
===================================================================
--- gnuradio/branches/releases/3.2/mblock/src/lib/mb_worker.cc  2009-06-28 
20:32:51 UTC (rev 11300)
+++ gnuradio/branches/releases/3.2/mblock/src/lib/mb_worker.cc  2009-06-28 
20:38:07 UTC (rev 11301)
@@ -29,6 +29,7 @@
 #include <mb_gettid.h>
 #include <mblock/msg_accepter.h>
 #include <iostream>
+#include <cstdio>
 #ifdef HAVE_SCHED_H
 #include <sched.h>
 #endif

Modified: gnuradio/branches/releases/3.2/mblock/src/lib/qa_bitset.cc
===================================================================
--- gnuradio/branches/releases/3.2/mblock/src/lib/qa_bitset.cc  2009-06-28 
20:32:51 UTC (rev 11300)
+++ gnuradio/branches/releases/3.2/mblock/src/lib/qa_bitset.cc  2009-06-28 
20:38:07 UTC (rev 11301)
@@ -27,6 +27,7 @@
 #include <mblock/message.h>
 #include <mblock/class_registry.h>
 #include <iostream>
+#include <cstdio>
 #include <sstream>
 #include <bitset>
 

Modified: gnuradio/branches/releases/3.2/mblock/src/lib/qa_disconnect.cc
===================================================================
--- gnuradio/branches/releases/3.2/mblock/src/lib/qa_disconnect.cc      
2009-06-28 20:32:51 UTC (rev 11300)
+++ gnuradio/branches/releases/3.2/mblock/src/lib/qa_disconnect.cc      
2009-06-28 20:38:07 UTC (rev 11301)
@@ -27,6 +27,7 @@
 #include <mblock/message.h>
 #include <mblock/class_registry.h>
 #include <iostream>
+#include <cstdio>
 #include <sstream>
 #include <bitset>
 

Modified: gnuradio/branches/releases/3.2/usrp/host/lib/legacy/db_boards.cc
===================================================================
--- gnuradio/branches/releases/3.2/usrp/host/lib/legacy/db_boards.cc    
2009-06-28 20:32:51 UTC (rev 11300)
+++ gnuradio/branches/releases/3.2/usrp/host/lib/legacy/db_boards.cc    
2009-06-28 20:38:07 UTC (rev 11301)
@@ -31,6 +31,7 @@
 #include <db_wbx.h>
 #include <db_dtt754.h>
 #include <db_dtt768.h>
+#include <cstdio>
 
 std::vector<db_base_sptr>
 instantiate_dbs(int dbid, usrp_basic_sptr usrp, int which_side)

Modified: gnuradio/branches/releases/3.2/usrp/host/lib/legacy/db_dbs_rx.cc
===================================================================
--- gnuradio/branches/releases/3.2/usrp/host/lib/legacy/db_dbs_rx.cc    
2009-06-28 20:32:51 UTC (rev 11300)
+++ gnuradio/branches/releases/3.2/usrp/host/lib/legacy/db_dbs_rx.cc    
2009-06-28 20:38:07 UTC (rev 11301)
@@ -21,6 +21,7 @@
 #include <db_dbs_rx.h>
 #include <db_base_impl.h>
 #include <cmath>
+#include <cstdio>
 
 
 /*****************************************************************************/

Modified: gnuradio/branches/releases/3.2/usrp/host/lib/legacy/db_xcvr2450.cc
===================================================================
--- gnuradio/branches/releases/3.2/usrp/host/lib/legacy/db_xcvr2450.cc  
2009-06-28 20:32:51 UTC (rev 11300)
+++ gnuradio/branches/releases/3.2/usrp/host/lib/legacy/db_xcvr2450.cc  
2009-06-28 20:38:07 UTC (rev 11301)
@@ -23,6 +23,7 @@
 #include <cmath>
 #include <boost/thread.hpp>
 #include <boost/weak_ptr.hpp>
+#include <cstdio>
 
 #if 0
 #define LO_OFFSET 4.25e6

Modified: gnuradio/branches/releases/3.2/usrp/host/lib/legacy/fusb_linux.cc
===================================================================
--- gnuradio/branches/releases/3.2/usrp/host/lib/legacy/fusb_linux.cc   
2009-06-28 20:32:51 UTC (rev 11300)
+++ gnuradio/branches/releases/3.2/usrp/host/lib/legacy/fusb_linux.cc   
2009-06-28 20:38:07 UTC (rev 11301)
@@ -37,6 +37,7 @@
 #include <algorithm>
 #include <errno.h>
 #include <string.h>
+#include <cstdio>
 
 #define MINIMIZE_TX_BUFFERING 1                // must be defined to 0 or 1
 

Modified: gnuradio/branches/releases/3.2/usrp/host/lib/legacy/usrp_basic.cc
===================================================================
--- gnuradio/branches/releases/3.2/usrp/host/lib/legacy/usrp_basic.cc   
2009-06-28 20:32:51 UTC (rev 11300)
+++ gnuradio/branches/releases/3.2/usrp/host/lib/legacy/usrp_basic.cc   
2009-06-28 20:38:07 UTC (rev 11301)
@@ -37,6 +37,7 @@
 #include <math.h>
 #include <ad9862.h>
 #include <string.h>
+#include <cstdio>
 
 using namespace ad9862;
 

Modified: gnuradio/branches/releases/3.2/usrp/host/lib/legacy/usrp_standard.cc
===================================================================
--- gnuradio/branches/releases/3.2/usrp/host/lib/legacy/usrp_standard.cc        
2009-06-28 20:32:51 UTC (rev 11300)
+++ gnuradio/branches/releases/3.2/usrp/host/lib/legacy/usrp_standard.cc        
2009-06-28 20:38:07 UTC (rev 11301)
@@ -29,6 +29,7 @@
 #include <assert.h>
 #include <math.h>
 #include <ad9862.h>
+#include <cstdio>
 
 
 static const int OLD_CAPS_VAL = 0xaa55ff77;

Modified: gnuradio/branches/releases/3.2/usrp2/host/apps/find_usrps.cc
===================================================================
--- gnuradio/branches/releases/3.2/usrp2/host/apps/find_usrps.cc        
2009-06-28 20:32:51 UTC (rev 11300)
+++ gnuradio/branches/releases/3.2/usrp2/host/apps/find_usrps.cc        
2009-06-28 20:38:07 UTC (rev 11301)
@@ -22,6 +22,7 @@
 
 #include <usrp2/usrp2.h>
 #include <iostream>
+#include <cstdio>
 #include <getopt.h>
 
 static void

Modified: gnuradio/branches/releases/3.2/usrp2/host/apps/gpio.cc
===================================================================
--- gnuradio/branches/releases/3.2/usrp2/host/apps/gpio.cc      2009-06-28 
20:32:51 UTC (rev 11300)
+++ gnuradio/branches/releases/3.2/usrp2/host/apps/gpio.cc      2009-06-28 
20:38:07 UTC (rev 11301)
@@ -22,6 +22,7 @@
 
 #include <usrp2/usrp2.h>
 #include <iostream>
+#include <cstdio>
 
 int
 main(int argc, char **argv)

Modified: gnuradio/branches/releases/3.2/usrp2/host/apps/rx_streaming_samples.cc
===================================================================
--- gnuradio/branches/releases/3.2/usrp2/host/apps/rx_streaming_samples.cc      
2009-06-28 20:32:51 UTC (rev 11300)
+++ gnuradio/branches/releases/3.2/usrp2/host/apps/rx_streaming_samples.cc      
2009-06-28 20:38:07 UTC (rev 11301)
@@ -27,6 +27,7 @@
 #include <gruel/realtime.h>
 #include <sys/time.h>
 #include <iostream>
+#include <cstdio>
 #include <string.h>
 #include <boost/scoped_ptr.hpp>
 #include <boost/shared_ptr.hpp>

Modified: gnuradio/branches/releases/3.2/usrp2/host/apps/test_mimo_tx.cc
===================================================================
--- gnuradio/branches/releases/3.2/usrp2/host/apps/test_mimo_tx.cc      
2009-06-28 20:32:51 UTC (rev 11300)
+++ gnuradio/branches/releases/3.2/usrp2/host/apps/test_mimo_tx.cc      
2009-06-28 20:38:07 UTC (rev 11301)
@@ -33,6 +33,7 @@
 #include <usrp2/usrp2.h>
 #include <usrp2/strtod_si.h>
 #include <iostream>
+#include <cstdio>
 #include <complex>
 #include <getopt.h>
 #include <gruel/realtime.h>

Modified: gnuradio/branches/releases/3.2/usrp2/host/apps/tx_samples.cc
===================================================================
--- gnuradio/branches/releases/3.2/usrp2/host/apps/tx_samples.cc        
2009-06-28 20:32:51 UTC (rev 11300)
+++ gnuradio/branches/releases/3.2/usrp2/host/apps/tx_samples.cc        
2009-06-28 20:38:07 UTC (rev 11301)
@@ -22,6 +22,7 @@
 #include <usrp2/usrp2.h>
 #include <usrp2/strtod_si.h>
 #include <iostream>
+#include <cstdio>
 #include <complex>
 #include <getopt.h>
 #include <gruel/realtime.h>


Property changes on: 
gnuradio/branches/releases/3.2/usrp2/host/include/usrp2/mimo_config.h
___________________________________________________________________
Modified: svn:mergeinfo
   - 
/gnuradio/branches/developers/eb/t348/usrp2/firmware/include/usrp2_mimo_config.h:10638-10648
/gnuradio/branches/developers/eb/t364/usrp2/firmware/include/usrp2_mimo_config.h:11016-11017
/gnuradio/branches/developers/eb/t367/usrp2/firmware/include/usrp2_mimo_config.h:11021-11025
/gnuradio/branches/developers/eb/t371/usrp2/firmware/include/usrp2_mimo_config.h:10958-10971
/gnuradio/branches/developers/eb/t378/usrp2/firmware/include/usrp2_mimo_config.h:10683-10688
/gnuradio/branches/developers/jblum/grc/usrp2/firmware/include/usrp2_mimo_config.h:10680-10938
/gnuradio/branches/developers/jblum/gui_guts/usrp2/firmware/include/usrp2_mimo_config.h:10464-10658
/gnuradio/branches/developers/jblum/vlen/usrp2/firmware/include/usrp2_mimo_config.h:10667-10677
/gnuradio/branches/developers/jblum/wxgui/usrp2/host/include/usrp2/mimo_config.h:11125-11183
/gnuradio/branches/developers/jcorgan/cpphier/usrp2/firmware/include/usrp2_mimo_config.h:10818-10858
/gnuradio/branches/developers/jcorgan/deb/usrp2/firmware/include/usrp2_mimo_config.h:10949-10959,11013-11022
/gnuradio/branches/developers/jcorgan/fw-optimize/usrp2/firmware/include/usrp2_mimo_config.h:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/usrp2/firmware/include/usrp2_mimo_config.h:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/usrp2/firmware/include/usrp2_mimo_config.h:10771-10887
/gnuradio/branches/developers/jcorgan/t161/usrp2/firmware/include/usrp2_mimo_config.h:10876-10880
/gnuradio/branches/developers/michaelld/am_swig_4/usrp2/firmware/include/usrp2_mimo_config.h:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/usrp2/firmware/include/usrp2_mimo_config.h:10540-10546
/gnuradio/trunk/usrp2/host/include/usrp2/mimo_config.h:10400,11084-11085,11088-11090,11099,11101,11106,11109,11111-11112,11115-11122,11130,11160-11173,11175,11182,11184-11185,11200,11209,11216,11224-11231,11239-11241,11254,11261
   + 
/gnuradio/branches/developers/eb/t348/usrp2/firmware/include/usrp2_mimo_config.h:10638-10648
/gnuradio/branches/developers/eb/t364/usrp2/firmware/include/usrp2_mimo_config.h:11016-11017
/gnuradio/branches/developers/eb/t367/usrp2/firmware/include/usrp2_mimo_config.h:11021-11025
/gnuradio/branches/developers/eb/t371/usrp2/firmware/include/usrp2_mimo_config.h:10958-10971
/gnuradio/branches/developers/eb/t378/usrp2/firmware/include/usrp2_mimo_config.h:10683-10688
/gnuradio/branches/developers/jblum/grc/usrp2/firmware/include/usrp2_mimo_config.h:10680-10938
/gnuradio/branches/developers/jblum/gui_guts/usrp2/firmware/include/usrp2_mimo_config.h:10464-10658
/gnuradio/branches/developers/jblum/vlen/usrp2/firmware/include/usrp2_mimo_config.h:10667-10677
/gnuradio/branches/developers/jblum/wxgui/usrp2/host/include/usrp2/mimo_config.h:11125-11183
/gnuradio/branches/developers/jcorgan/cpphier/usrp2/firmware/include/usrp2_mimo_config.h:10818-10858
/gnuradio/branches/developers/jcorgan/deb/usrp2/firmware/include/usrp2_mimo_config.h:10949-10959,11013-11022
/gnuradio/branches/developers/jcorgan/fw-optimize/usrp2/firmware/include/usrp2_mimo_config.h:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/usrp2/firmware/include/usrp2_mimo_config.h:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/usrp2/firmware/include/usrp2_mimo_config.h:10771-10887
/gnuradio/branches/developers/jcorgan/t161/usrp2/firmware/include/usrp2_mimo_config.h:10876-10880
/gnuradio/branches/developers/michaelld/am_swig_4/usrp2/firmware/include/usrp2_mimo_config.h:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/usrp2/firmware/include/usrp2_mimo_config.h:10540-10546
/gnuradio/trunk/usrp2/host/include/usrp2/mimo_config.h:10400,11084-11085,11088-11090,11099,11101,11106,11109,11111-11112,11115-11122,11130,11160-11173,11175,11182,11184-11185,11200,11209,11216,11224-11231,11239-11241,11254,11261,11265-11271

Modified: gnuradio/branches/releases/3.2/usrp2/host/lib/eth_buffer.cc
===================================================================
--- gnuradio/branches/releases/3.2/usrp2/host/lib/eth_buffer.cc 2009-06-28 
20:32:51 UTC (rev 11300)
+++ gnuradio/branches/releases/3.2/usrp2/host/lib/eth_buffer.cc 2009-06-28 
20:38:07 UTC (rev 11301)
@@ -35,6 +35,7 @@
 #include <errno.h>
 #include <stdexcept>
 #include <string.h>
+#include <cstdio>
 
 
 #define ETH_BUFFER_DEBUG      0 // define to 0 or 1

Modified: gnuradio/branches/releases/3.2/usrp2/host/lib/ethernet.cc
===================================================================
--- gnuradio/branches/releases/3.2/usrp2/host/lib/ethernet.cc   2009-06-28 
20:32:51 UTC (rev 11300)
+++ gnuradio/branches/releases/3.2/usrp2/host/lib/ethernet.cc   2009-06-28 
20:38:07 UTC (rev 11301)
@@ -20,10 +20,12 @@
 #include <config.h>
 #endif
 
+#include "eth_buffer.h"
 #include "ethernet.h"
 #include "pktfilter.h"
 #include <open_usrp2_socket.h>
 
+#include <cstdio>
 #include <iostream>
 #include <unistd.h>
 #include <fcntl.h>

Modified: gnuradio/branches/releases/3.2/usrp2/host/lib/find.cc
===================================================================
--- gnuradio/branches/releases/3.2/usrp2/host/lib/find.cc       2009-06-28 
20:32:51 UTC (rev 11300)
+++ gnuradio/branches/releases/3.2/usrp2/host/lib/find.cc       2009-06-28 
20:38:07 UTC (rev 11301)
@@ -29,6 +29,7 @@
 #include <string.h>
 #include <iostream>
 #include <stdexcept>
+#include <cstdio>
 
 #define FIND_DEBUG 0
 

Modified: gnuradio/branches/releases/3.2/usrp2/host/lib/usrp2.cc
===================================================================
--- gnuradio/branches/releases/3.2/usrp2/host/lib/usrp2.cc      2009-06-28 
20:32:51 UTC (rev 11300)
+++ gnuradio/branches/releases/3.2/usrp2/host/lib/usrp2.cc      2009-06-28 
20:38:07 UTC (rev 11301)
@@ -27,6 +27,7 @@
 #include <boost/weak_ptr.hpp>
 #include <string>
 #include <stdexcept>
+#include <cstdio>
 
 namespace usrp2 {
 





reply via email to

[Prev in Thread] Current Thread [Next in Thread]