[Commit-gnuradio] r11510 - in gnuradio/branches/developers/nldudok1/tvrx_mimo_merge_with_trunk: . usrp/host/include/usrp usrp/host/lib

[nldudok1]

Author: nldudok1
Date: 2009-07-27 12:17:54 -0600 (Mon, 27 Jul 2009)
New Revision: 11510

Modified:
   gnuradio/branches/developers/nldudok1/tvrx_mimo_merge_with_trunk/
   
gnuradio/branches/developers/nldudok1/tvrx_mimo_merge_with_trunk/usrp/host/include/usrp/usrp_basic.h
   
gnuradio/branches/developers/nldudok1/tvrx_mimo_merge_with_trunk/usrp/host/include/usrp/usrp_bytesex.h
   
gnuradio/branches/developers/nldudok1/tvrx_mimo_merge_with_trunk/usrp/host/include/usrp/usrp_local_sighandler.h
   
gnuradio/branches/developers/nldudok1/tvrx_mimo_merge_with_trunk/usrp/host/include/usrp/usrp_prims.h
   
gnuradio/branches/developers/nldudok1/tvrx_mimo_merge_with_trunk/usrp/host/include/usrp/usrp_slots.h
   
gnuradio/branches/developers/nldudok1/tvrx_mimo_merge_with_trunk/usrp/host/include/usrp/usrp_standard.h
   
gnuradio/branches/developers/nldudok1/tvrx_mimo_merge_with_trunk/usrp/host/lib/gen-ratios
Log:
merge: update to current trunk


Property changes on: 
gnuradio/branches/developers/nldudok1/tvrx_mimo_merge_with_trunk
___________________________________________________________________
Modified: svn:mergeinfo
   - /gnuradio/trunk:11480-11507
   + /gnuradio/trunk:11480-11509


Property changes on: 
gnuradio/branches/developers/nldudok1/tvrx_mimo_merge_with_trunk/usrp/host/include/usrp/usrp_basic.h
___________________________________________________________________
Modified: svn:mergeinfo
   - 
/gnuradio/branches/developers/balister/arm-configure/usrp/host/include/usrp/usrp_basic.h:11398-11413
/gnuradio/branches/developers/eb/t348/usrp/host/lib/legacy/usrp_basic.h:10638-10648
/gnuradio/branches/developers/eb/t364/usrp/host/lib/legacy/usrp_basic.h:11016-11017
/gnuradio/branches/developers/eb/t367/usrp/host/lib/legacy/usrp_basic.h:11021-11025
/gnuradio/branches/developers/eb/t371/usrp/host/lib/legacy/usrp_basic.h:10958-10971
/gnuradio/branches/developers/eb/t378/usrp/host/lib/legacy/usrp_basic.h:10683-10688
/gnuradio/branches/developers/jblum/grc/usrp/host/lib/legacy/usrp_basic.h:10680-10938,11187-11273,11310-11357
/gnuradio/branches/developers/jblum/gui_guts/usrp/host/lib/legacy/usrp_basic.h:10464-10658
/gnuradio/branches/developers/jblum/vlen/usrp/host/lib/legacy/usrp_basic.h:10667-10677
/gnuradio/branches/developers/jblum/wxgui/usrp/host/lib/legacy/usrp_basic.h:11125-11183
/gnuradio/branches/developers/jcorgan/cpphier/usrp/host/lib/legacy/usrp_basic.h:10818-10858
/gnuradio/branches/developers/jcorgan/deb/usrp/host/lib/legacy/usrp_basic.h:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/branches/developers/jcorgan/fw-optimize/usrp/host/lib/legacy/usrp_basic.h:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/usrp/host/lib/legacy/usrp_basic.h:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/usrp/host/lib/legacy/usrp_basic.h:10771-10887
/gnuradio/branches/developers/jcorgan/np/usrp/host/lib/legacy/usrp_basic.h:11124-11148
/gnuradio/branches/developers/jcorgan/omni/usrp/host/include/usrp/usrp_basic.h:11463-11485
/gnuradio/branches/developers/jcorgan/pmt/usrp/host/include/usrp/usrp_basic.h:11492-11494
/gnuradio/branches/developers/jcorgan/pmt-gruel/usrp/host/include/usrp/usrp_basic.h:11453-11459
/gnuradio/branches/developers/jcorgan/t161/usrp/host/lib/legacy/usrp_basic.h:10876-10880
/gnuradio/branches/developers/michaelld/am_swig_4/usrp/host/lib/legacy/usrp_basic.h:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/usrp/host/lib/legacy/usrp_basic.h:10540-10546
/gnuradio/branches/developers/trondeau/qt/usrp/host/lib/legacy/usrp_basic.h:11235-11360
/gnuradio/trunk/usrp/host/include/usrp/usrp_basic.h:11480-11507
   + 
/gnuradio/branches/developers/balister/arm-configure/usrp/host/include/usrp/usrp_basic.h:11398-11413
/gnuradio/branches/developers/eb/t348/usrp/host/lib/legacy/usrp_basic.h:10638-10648
/gnuradio/branches/developers/eb/t364/usrp/host/lib/legacy/usrp_basic.h:11016-11017
/gnuradio/branches/developers/eb/t367/usrp/host/lib/legacy/usrp_basic.h:11021-11025
/gnuradio/branches/developers/eb/t371/usrp/host/lib/legacy/usrp_basic.h:10958-10971
/gnuradio/branches/developers/eb/t378/usrp/host/lib/legacy/usrp_basic.h:10683-10688
/gnuradio/branches/developers/jblum/grc/usrp/host/lib/legacy/usrp_basic.h:10680-10938,11187-11273,11310-11357
/gnuradio/branches/developers/jblum/gui_guts/usrp/host/lib/legacy/usrp_basic.h:10464-10658
/gnuradio/branches/developers/jblum/vlen/usrp/host/lib/legacy/usrp_basic.h:10667-10677
/gnuradio/branches/developers/jblum/wxgui/usrp/host/lib/legacy/usrp_basic.h:11125-11183
/gnuradio/branches/developers/jcorgan/cpphier/usrp/host/lib/legacy/usrp_basic.h:10818-10858
/gnuradio/branches/developers/jcorgan/deb/usrp/host/lib/legacy/usrp_basic.h:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/branches/developers/jcorgan/fw-optimize/usrp/host/lib/legacy/usrp_basic.h:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/usrp/host/lib/legacy/usrp_basic.h:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/usrp/host/lib/legacy/usrp_basic.h:10771-10887
/gnuradio/branches/developers/jcorgan/np/usrp/host/lib/legacy/usrp_basic.h:11124-11148
/gnuradio/branches/developers/jcorgan/omni/usrp/host/include/usrp/usrp_basic.h:11463-11485
/gnuradio/branches/developers/jcorgan/pmt/usrp/host/include/usrp/usrp_basic.h:11492-11494
/gnuradio/branches/developers/jcorgan/pmt-gruel/usrp/host/include/usrp/usrp_basic.h:11453-11459
/gnuradio/branches/developers/jcorgan/t161/usrp/host/lib/legacy/usrp_basic.h:10876-10880
/gnuradio/branches/developers/michaelld/am_swig_4/usrp/host/lib/legacy/usrp_basic.h:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/usrp/host/lib/legacy/usrp_basic.h:10540-10546
/gnuradio/branches/developers/trondeau/qt/usrp/host/lib/legacy/usrp_basic.h:11235-11360
/gnuradio/trunk/usrp/host/include/usrp/usrp_basic.h:11480-11509


Property changes on: 
gnuradio/branches/developers/nldudok1/tvrx_mimo_merge_with_trunk/usrp/host/include/usrp/usrp_bytesex.h
___________________________________________________________________
Modified: svn:mergeinfo
   - 
/gnuradio/branches/developers/balister/arm-configure/usrp/host/include/usrp/usrp_bytesex.h:11398-11413
/gnuradio/branches/developers/eb/t348/usrp/host/lib/legacy/usrp_bytesex.h:10638-10648
/gnuradio/branches/developers/eb/t364/usrp/host/lib/legacy/usrp_bytesex.h:11016-11017
/gnuradio/branches/developers/eb/t367/usrp/host/lib/legacy/usrp_bytesex.h:11021-11025
/gnuradio/branches/developers/eb/t371/usrp/host/lib/legacy/usrp_bytesex.h:10958-10971
/gnuradio/branches/developers/eb/t378/usrp/host/lib/legacy/usrp_bytesex.h:10683-10688
/gnuradio/branches/developers/jblum/grc/usrp/host/lib/legacy/usrp_bytesex.h:10680-10938,11187-11273,11310-11357
/gnuradio/branches/developers/jblum/gui_guts/usrp/host/lib/legacy/usrp_bytesex.h:10464-10658
/gnuradio/branches/developers/jblum/vlen/usrp/host/lib/legacy/usrp_bytesex.h:10667-10677
/gnuradio/branches/developers/jblum/wxgui/usrp/host/lib/legacy/usrp_bytesex.h:11125-11183
/gnuradio/branches/developers/jcorgan/cpphier/usrp/host/lib/legacy/usrp_bytesex.h:10818-10858
/gnuradio/branches/developers/jcorgan/deb/usrp/host/lib/legacy/usrp_bytesex.h:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/branches/developers/jcorgan/fw-optimize/usrp/host/lib/legacy/usrp_bytesex.h:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/usrp/host/lib/legacy/usrp_bytesex.h:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/usrp/host/lib/legacy/usrp_bytesex.h:10771-10887
/gnuradio/branches/developers/jcorgan/np/usrp/host/lib/legacy/usrp_bytesex.h:11124-11148
/gnuradio/branches/developers/jcorgan/omni/usrp/host/include/usrp/usrp_bytesex.h:11463-11485
/gnuradio/branches/developers/jcorgan/pmt/usrp/host/include/usrp/usrp_bytesex.h:11492-11494
/gnuradio/branches/developers/jcorgan/pmt-gruel/usrp/host/include/usrp/usrp_bytesex.h:11453-11459
/gnuradio/branches/developers/jcorgan/t161/usrp/host/lib/legacy/usrp_bytesex.h:10876-10880
/gnuradio/branches/developers/michaelld/am_swig_4/usrp/host/lib/legacy/usrp_bytesex.h:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/usrp/host/lib/legacy/usrp_bytesex.h:10540-10546
/gnuradio/branches/developers/trondeau/qt/usrp/host/lib/legacy/usrp_bytesex.h:11235-11360
/gnuradio/trunk/usrp/host/include/usrp/usrp_bytesex.h:11480-11507
   + 
/gnuradio/branches/developers/balister/arm-configure/usrp/host/include/usrp/usrp_bytesex.h:11398-11413
/gnuradio/branches/developers/eb/t348/usrp/host/lib/legacy/usrp_bytesex.h:10638-10648
/gnuradio/branches/developers/eb/t364/usrp/host/lib/legacy/usrp_bytesex.h:11016-11017
/gnuradio/branches/developers/eb/t367/usrp/host/lib/legacy/usrp_bytesex.h:11021-11025
/gnuradio/branches/developers/eb/t371/usrp/host/lib/legacy/usrp_bytesex.h:10958-10971
/gnuradio/branches/developers/eb/t378/usrp/host/lib/legacy/usrp_bytesex.h:10683-10688
/gnuradio/branches/developers/jblum/grc/usrp/host/lib/legacy/usrp_bytesex.h:10680-10938,11187-11273,11310-11357
/gnuradio/branches/developers/jblum/gui_guts/usrp/host/lib/legacy/usrp_bytesex.h:10464-10658
/gnuradio/branches/developers/jblum/vlen/usrp/host/lib/legacy/usrp_bytesex.h:10667-10677
/gnuradio/branches/developers/jblum/wxgui/usrp/host/lib/legacy/usrp_bytesex.h:11125-11183
/gnuradio/branches/developers/jcorgan/cpphier/usrp/host/lib/legacy/usrp_bytesex.h:10818-10858
/gnuradio/branches/developers/jcorgan/deb/usrp/host/lib/legacy/usrp_bytesex.h:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/branches/developers/jcorgan/fw-optimize/usrp/host/lib/legacy/usrp_bytesex.h:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/usrp/host/lib/legacy/usrp_bytesex.h:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/usrp/host/lib/legacy/usrp_bytesex.h:10771-10887
/gnuradio/branches/developers/jcorgan/np/usrp/host/lib/legacy/usrp_bytesex.h:11124-11148
/gnuradio/branches/developers/jcorgan/omni/usrp/host/include/usrp/usrp_bytesex.h:11463-11485
/gnuradio/branches/developers/jcorgan/pmt/usrp/host/include/usrp/usrp_bytesex.h:11492-11494
/gnuradio/branches/developers/jcorgan/pmt-gruel/usrp/host/include/usrp/usrp_bytesex.h:11453-11459
/gnuradio/branches/developers/jcorgan/t161/usrp/host/lib/legacy/usrp_bytesex.h:10876-10880
/gnuradio/branches/developers/michaelld/am_swig_4/usrp/host/lib/legacy/usrp_bytesex.h:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/usrp/host/lib/legacy/usrp_bytesex.h:10540-10546
/gnuradio/branches/developers/trondeau/qt/usrp/host/lib/legacy/usrp_bytesex.h:11235-11360
/gnuradio/trunk/usrp/host/include/usrp/usrp_bytesex.h:11480-11509


Property changes on: 
gnuradio/branches/developers/nldudok1/tvrx_mimo_merge_with_trunk/usrp/host/include/usrp/usrp_local_sighandler.h
___________________________________________________________________
Modified: svn:mergeinfo
   - 
/gnuradio/branches/developers/balister/arm-configure/usrp/host/include/usrp/usrp_local_sighandler.h:11398-11413
/gnuradio/branches/developers/eb/t348/usrp/host/lib/legacy/usrp_local_sighandler.h:10638-10648
/gnuradio/branches/developers/eb/t364/usrp/host/lib/legacy/usrp_local_sighandler.h:11016-11017
/gnuradio/branches/developers/eb/t367/usrp/host/lib/legacy/usrp_local_sighandler.h:11021-11025
/gnuradio/branches/developers/eb/t371/usrp/host/lib/legacy/usrp_local_sighandler.h:10958-10971
/gnuradio/branches/developers/eb/t378/usrp/host/lib/legacy/usrp_local_sighandler.h:10683-10688
/gnuradio/branches/developers/jblum/grc/usrp/host/lib/legacy/usrp_local_sighandler.h:10680-10938,11187-11273,11310-11357
/gnuradio/branches/developers/jblum/gui_guts/usrp/host/lib/legacy/usrp_local_sighandler.h:10464-10658
/gnuradio/branches/developers/jblum/vlen/usrp/host/lib/legacy/usrp_local_sighandler.h:10667-10677
/gnuradio/branches/developers/jblum/wxgui/usrp/host/lib/legacy/usrp_local_sighandler.h:11125-11183
/gnuradio/branches/developers/jcorgan/cpphier/usrp/host/lib/legacy/usrp_local_sighandler.h:10818-10858
/gnuradio/branches/developers/jcorgan/deb/usrp/host/lib/legacy/usrp_local_sighandler.h:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/branches/developers/jcorgan/fw-optimize/usrp/host/lib/legacy/usrp_local_sighandler.h:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/usrp/host/lib/legacy/usrp_local_sighandler.h:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/usrp/host/lib/legacy/usrp_local_sighandler.h:10771-10887
/gnuradio/branches/developers/jcorgan/np/usrp/host/lib/legacy/usrp_local_sighandler.h:11124-11148
/gnuradio/branches/developers/jcorgan/omni/usrp/host/include/usrp/usrp_local_sighandler.h:11463-11485
/gnuradio/branches/developers/jcorgan/pmt/usrp/host/include/usrp/usrp_local_sighandler.h:11492-11494
/gnuradio/branches/developers/jcorgan/pmt-gruel/usrp/host/include/usrp/usrp_local_sighandler.h:11453-11459
/gnuradio/branches/developers/jcorgan/t161/usrp/host/lib/legacy/usrp_local_sighandler.h:10876-10880
/gnuradio/branches/developers/michaelld/am_swig_4/usrp/host/lib/legacy/usrp_local_sighandler.h:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/usrp/host/lib/legacy/usrp_local_sighandler.h:10540-10546
/gnuradio/branches/developers/trondeau/qt/usrp/host/lib/legacy/usrp_local_sighandler.h:11235-11360
/gnuradio/trunk/usrp/host/include/usrp/usrp_local_sighandler.h:11480-11507
   + 
/gnuradio/branches/developers/balister/arm-configure/usrp/host/include/usrp/usrp_local_sighandler.h:11398-11413
/gnuradio/branches/developers/eb/t348/usrp/host/lib/legacy/usrp_local_sighandler.h:10638-10648
/gnuradio/branches/developers/eb/t364/usrp/host/lib/legacy/usrp_local_sighandler.h:11016-11017
/gnuradio/branches/developers/eb/t367/usrp/host/lib/legacy/usrp_local_sighandler.h:11021-11025
/gnuradio/branches/developers/eb/t371/usrp/host/lib/legacy/usrp_local_sighandler.h:10958-10971
/gnuradio/branches/developers/eb/t378/usrp/host/lib/legacy/usrp_local_sighandler.h:10683-10688
/gnuradio/branches/developers/jblum/grc/usrp/host/lib/legacy/usrp_local_sighandler.h:10680-10938,11187-11273,11310-11357
/gnuradio/branches/developers/jblum/gui_guts/usrp/host/lib/legacy/usrp_local_sighandler.h:10464-10658
/gnuradio/branches/developers/jblum/vlen/usrp/host/lib/legacy/usrp_local_sighandler.h:10667-10677
/gnuradio/branches/developers/jblum/wxgui/usrp/host/lib/legacy/usrp_local_sighandler.h:11125-11183
/gnuradio/branches/developers/jcorgan/cpphier/usrp/host/lib/legacy/usrp_local_sighandler.h:10818-10858
/gnuradio/branches/developers/jcorgan/deb/usrp/host/lib/legacy/usrp_local_sighandler.h:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/branches/developers/jcorgan/fw-optimize/usrp/host/lib/legacy/usrp_local_sighandler.h:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/usrp/host/lib/legacy/usrp_local_sighandler.h:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/usrp/host/lib/legacy/usrp_local_sighandler.h:10771-10887
/gnuradio/branches/developers/jcorgan/np/usrp/host/lib/legacy/usrp_local_sighandler.h:11124-11148
/gnuradio/branches/developers/jcorgan/omni/usrp/host/include/usrp/usrp_local_sighandler.h:11463-11485
/gnuradio/branches/developers/jcorgan/pmt/usrp/host/include/usrp/usrp_local_sighandler.h:11492-11494
/gnuradio/branches/developers/jcorgan/pmt-gruel/usrp/host/include/usrp/usrp_local_sighandler.h:11453-11459
/gnuradio/branches/developers/jcorgan/t161/usrp/host/lib/legacy/usrp_local_sighandler.h:10876-10880
/gnuradio/branches/developers/michaelld/am_swig_4/usrp/host/lib/legacy/usrp_local_sighandler.h:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/usrp/host/lib/legacy/usrp_local_sighandler.h:10540-10546
/gnuradio/branches/developers/trondeau/qt/usrp/host/lib/legacy/usrp_local_sighandler.h:11235-11360
/gnuradio/trunk/usrp/host/include/usrp/usrp_local_sighandler.h:11480-11509


Property changes on: 
gnuradio/branches/developers/nldudok1/tvrx_mimo_merge_with_trunk/usrp/host/include/usrp/usrp_prims.h
___________________________________________________________________
Modified: svn:mergeinfo
   - 
/gnuradio/branches/developers/balister/arm-configure/usrp/host/include/usrp/usrp_prims.h:11398-11413
/gnuradio/branches/developers/eb/t348/usrp/host/lib/legacy/usrp_prims.h:10638-10648
/gnuradio/branches/developers/eb/t364/usrp/host/lib/legacy/usrp_prims.h:11016-11017
/gnuradio/branches/developers/eb/t367/usrp/host/lib/legacy/usrp_prims.h:11021-11025
/gnuradio/branches/developers/eb/t371/usrp/host/lib/legacy/usrp_prims.h:10958-10971
/gnuradio/branches/developers/eb/t378/usrp/host/lib/legacy/usrp_prims.h:10683-10688
/gnuradio/branches/developers/jblum/grc/usrp/host/lib/legacy/usrp_prims.h:10680-10938,11187-11273,11310-11357
/gnuradio/branches/developers/jblum/gui_guts/usrp/host/lib/legacy/usrp_prims.h:10464-10658
/gnuradio/branches/developers/jblum/vlen/usrp/host/lib/legacy/usrp_prims.h:10667-10677
/gnuradio/branches/developers/jblum/wxgui/usrp/host/lib/legacy/usrp_prims.h:11125-11183
/gnuradio/branches/developers/jcorgan/cpphier/usrp/host/lib/legacy/usrp_prims.h:10818-10858
/gnuradio/branches/developers/jcorgan/deb/usrp/host/lib/legacy/usrp_prims.h:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/branches/developers/jcorgan/fw-optimize/usrp/host/lib/legacy/usrp_prims.h:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/usrp/host/lib/legacy/usrp_prims.h:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/usrp/host/lib/legacy/usrp_prims.h:10771-10887
/gnuradio/branches/developers/jcorgan/np/usrp/host/lib/legacy/usrp_prims.h:11124-11148
/gnuradio/branches/developers/jcorgan/omni/usrp/host/include/usrp/usrp_prims.h:11463-11485
/gnuradio/branches/developers/jcorgan/pmt/usrp/host/include/usrp/usrp_prims.h:11492-11494
/gnuradio/branches/developers/jcorgan/pmt-gruel/usrp/host/include/usrp/usrp_prims.h:11453-11459
/gnuradio/branches/developers/jcorgan/t161/usrp/host/lib/legacy/usrp_prims.h:10876-10880
/gnuradio/branches/developers/michaelld/am_swig_4/usrp/host/lib/legacy/usrp_prims.h:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/usrp/host/lib/legacy/usrp_prims.h:10540-10546
/gnuradio/branches/developers/trondeau/qt/usrp/host/lib/legacy/usrp_prims.h:11235-11360
/gnuradio/trunk/usrp/host/include/usrp/usrp_prims.h:11480-11507
   + 
/gnuradio/branches/developers/balister/arm-configure/usrp/host/include/usrp/usrp_prims.h:11398-11413
/gnuradio/branches/developers/eb/t348/usrp/host/lib/legacy/usrp_prims.h:10638-10648
/gnuradio/branches/developers/eb/t364/usrp/host/lib/legacy/usrp_prims.h:11016-11017
/gnuradio/branches/developers/eb/t367/usrp/host/lib/legacy/usrp_prims.h:11021-11025
/gnuradio/branches/developers/eb/t371/usrp/host/lib/legacy/usrp_prims.h:10958-10971
/gnuradio/branches/developers/eb/t378/usrp/host/lib/legacy/usrp_prims.h:10683-10688
/gnuradio/branches/developers/jblum/grc/usrp/host/lib/legacy/usrp_prims.h:10680-10938,11187-11273,11310-11357
/gnuradio/branches/developers/jblum/gui_guts/usrp/host/lib/legacy/usrp_prims.h:10464-10658
/gnuradio/branches/developers/jblum/vlen/usrp/host/lib/legacy/usrp_prims.h:10667-10677
/gnuradio/branches/developers/jblum/wxgui/usrp/host/lib/legacy/usrp_prims.h:11125-11183
/gnuradio/branches/developers/jcorgan/cpphier/usrp/host/lib/legacy/usrp_prims.h:10818-10858
/gnuradio/branches/developers/jcorgan/deb/usrp/host/lib/legacy/usrp_prims.h:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/branches/developers/jcorgan/fw-optimize/usrp/host/lib/legacy/usrp_prims.h:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/usrp/host/lib/legacy/usrp_prims.h:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/usrp/host/lib/legacy/usrp_prims.h:10771-10887
/gnuradio/branches/developers/jcorgan/np/usrp/host/lib/legacy/usrp_prims.h:11124-11148
/gnuradio/branches/developers/jcorgan/omni/usrp/host/include/usrp/usrp_prims.h:11463-11485
/gnuradio/branches/developers/jcorgan/pmt/usrp/host/include/usrp/usrp_prims.h:11492-11494
/gnuradio/branches/developers/jcorgan/pmt-gruel/usrp/host/include/usrp/usrp_prims.h:11453-11459
/gnuradio/branches/developers/jcorgan/t161/usrp/host/lib/legacy/usrp_prims.h:10876-10880
/gnuradio/branches/developers/michaelld/am_swig_4/usrp/host/lib/legacy/usrp_prims.h:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/usrp/host/lib/legacy/usrp_prims.h:10540-10546
/gnuradio/branches/developers/trondeau/qt/usrp/host/lib/legacy/usrp_prims.h:11235-11360
/gnuradio/trunk/usrp/host/include/usrp/usrp_prims.h:11480-11509


Property changes on: 
gnuradio/branches/developers/nldudok1/tvrx_mimo_merge_with_trunk/usrp/host/include/usrp/usrp_slots.h
___________________________________________________________________
Modified: svn:mergeinfo
   - 
/gnuradio/branches/developers/balister/arm-configure/usrp/host/include/usrp/usrp_slots.h:11398-11413
/gnuradio/branches/developers/eb/t348/usrp/host/lib/legacy/usrp_slots.h:10638-10648
/gnuradio/branches/developers/eb/t364/usrp/host/lib/legacy/usrp_slots.h:11016-11017
/gnuradio/branches/developers/eb/t367/usrp/host/lib/legacy/usrp_slots.h:11021-11025
/gnuradio/branches/developers/eb/t371/usrp/host/lib/legacy/usrp_slots.h:10958-10971
/gnuradio/branches/developers/eb/t378/usrp/host/lib/legacy/usrp_slots.h:10683-10688
/gnuradio/branches/developers/jblum/grc/usrp/host/lib/legacy/usrp_slots.h:10680-10938,11187-11273,11310-11357
/gnuradio/branches/developers/jblum/gui_guts/usrp/host/lib/legacy/usrp_slots.h:10464-10658
/gnuradio/branches/developers/jblum/vlen/usrp/host/lib/legacy/usrp_slots.h:10667-10677
/gnuradio/branches/developers/jblum/wxgui/usrp/host/lib/legacy/usrp_slots.h:11125-11183
/gnuradio/branches/developers/jcorgan/cpphier/usrp/host/lib/legacy/usrp_slots.h:10818-10858
/gnuradio/branches/developers/jcorgan/deb/usrp/host/lib/legacy/usrp_slots.h:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/branches/developers/jcorgan/fw-optimize/usrp/host/lib/legacy/usrp_slots.h:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/usrp/host/lib/legacy/usrp_slots.h:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/usrp/host/lib/legacy/usrp_slots.h:10771-10887
/gnuradio/branches/developers/jcorgan/np/usrp/host/lib/legacy/usrp_slots.h:11124-11148
/gnuradio/branches/developers/jcorgan/omni/usrp/host/include/usrp/usrp_slots.h:11463-11485
/gnuradio/branches/developers/jcorgan/pmt/usrp/host/include/usrp/usrp_slots.h:11492-11494
/gnuradio/branches/developers/jcorgan/pmt-gruel/usrp/host/include/usrp/usrp_slots.h:11453-11459
/gnuradio/branches/developers/jcorgan/t161/usrp/host/lib/legacy/usrp_slots.h:10876-10880
/gnuradio/branches/developers/michaelld/am_swig_4/usrp/host/lib/legacy/usrp_slots.h:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/usrp/host/lib/legacy/usrp_slots.h:10540-10546
/gnuradio/branches/developers/trondeau/qt/usrp/host/lib/legacy/usrp_slots.h:11235-11360
/gnuradio/trunk/usrp/host/include/usrp/usrp_slots.h:11480-11507
   + 
/gnuradio/branches/developers/balister/arm-configure/usrp/host/include/usrp/usrp_slots.h:11398-11413
/gnuradio/branches/developers/eb/t348/usrp/host/lib/legacy/usrp_slots.h:10638-10648
/gnuradio/branches/developers/eb/t364/usrp/host/lib/legacy/usrp_slots.h:11016-11017
/gnuradio/branches/developers/eb/t367/usrp/host/lib/legacy/usrp_slots.h:11021-11025
/gnuradio/branches/developers/eb/t371/usrp/host/lib/legacy/usrp_slots.h:10958-10971
/gnuradio/branches/developers/eb/t378/usrp/host/lib/legacy/usrp_slots.h:10683-10688
/gnuradio/branches/developers/jblum/grc/usrp/host/lib/legacy/usrp_slots.h:10680-10938,11187-11273,11310-11357
/gnuradio/branches/developers/jblum/gui_guts/usrp/host/lib/legacy/usrp_slots.h:10464-10658
/gnuradio/branches/developers/jblum/vlen/usrp/host/lib/legacy/usrp_slots.h:10667-10677
/gnuradio/branches/developers/jblum/wxgui/usrp/host/lib/legacy/usrp_slots.h:11125-11183
/gnuradio/branches/developers/jcorgan/cpphier/usrp/host/lib/legacy/usrp_slots.h:10818-10858
/gnuradio/branches/developers/jcorgan/deb/usrp/host/lib/legacy/usrp_slots.h:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/branches/developers/jcorgan/fw-optimize/usrp/host/lib/legacy/usrp_slots.h:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/usrp/host/lib/legacy/usrp_slots.h:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/usrp/host/lib/legacy/usrp_slots.h:10771-10887
/gnuradio/branches/developers/jcorgan/np/usrp/host/lib/legacy/usrp_slots.h:11124-11148
/gnuradio/branches/developers/jcorgan/omni/usrp/host/include/usrp/usrp_slots.h:11463-11485
/gnuradio/branches/developers/jcorgan/pmt/usrp/host/include/usrp/usrp_slots.h:11492-11494
/gnuradio/branches/developers/jcorgan/pmt-gruel/usrp/host/include/usrp/usrp_slots.h:11453-11459
/gnuradio/branches/developers/jcorgan/t161/usrp/host/lib/legacy/usrp_slots.h:10876-10880
/gnuradio/branches/developers/michaelld/am_swig_4/usrp/host/lib/legacy/usrp_slots.h:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/usrp/host/lib/legacy/usrp_slots.h:10540-10546
/gnuradio/branches/developers/trondeau/qt/usrp/host/lib/legacy/usrp_slots.h:11235-11360
/gnuradio/trunk/usrp/host/include/usrp/usrp_slots.h:11480-11509


Property changes on: 
gnuradio/branches/developers/nldudok1/tvrx_mimo_merge_with_trunk/usrp/host/include/usrp/usrp_standard.h
___________________________________________________________________
Modified: svn:mergeinfo
   - 
/gnuradio/branches/developers/balister/arm-configure/usrp/host/include/usrp/usrp_standard.h:11398-11413
/gnuradio/branches/developers/eb/t348/usrp/host/lib/legacy/usrp_standard.h:10638-10648
/gnuradio/branches/developers/eb/t364/usrp/host/lib/legacy/usrp_standard.h:11016-11017
/gnuradio/branches/developers/eb/t367/usrp/host/lib/legacy/usrp_standard.h:11021-11025
/gnuradio/branches/developers/eb/t371/usrp/host/lib/legacy/usrp_standard.h:10958-10971
/gnuradio/branches/developers/eb/t378/usrp/host/lib/legacy/usrp_standard.h:10683-10688
/gnuradio/branches/developers/jblum/grc/usrp/host/lib/legacy/usrp_standard.h:10680-10938,11187-11273,11310-11357
/gnuradio/branches/developers/jblum/gui_guts/usrp/host/lib/legacy/usrp_standard.h:10464-10658
/gnuradio/branches/developers/jblum/vlen/usrp/host/lib/legacy/usrp_standard.h:10667-10677
/gnuradio/branches/developers/jblum/wxgui/usrp/host/lib/legacy/usrp_standard.h:11125-11183
/gnuradio/branches/developers/jcorgan/cpphier/usrp/host/lib/legacy/usrp_standard.h:10818-10858
/gnuradio/branches/developers/jcorgan/deb/usrp/host/lib/legacy/usrp_standard.h:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/branches/developers/jcorgan/fw-optimize/usrp/host/lib/legacy/usrp_standard.h:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/usrp/host/lib/legacy/usrp_standard.h:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/usrp/host/lib/legacy/usrp_standard.h:10771-10887
/gnuradio/branches/developers/jcorgan/np/usrp/host/lib/legacy/usrp_standard.h:11124-11148
/gnuradio/branches/developers/jcorgan/omni/usrp/host/include/usrp/usrp_standard.h:11463-11485
/gnuradio/branches/developers/jcorgan/pmt/usrp/host/include/usrp/usrp_standard.h:11492-11494
/gnuradio/branches/developers/jcorgan/pmt-gruel/usrp/host/include/usrp/usrp_standard.h:11453-11459
/gnuradio/branches/developers/jcorgan/t161/usrp/host/lib/legacy/usrp_standard.h:10876-10880
/gnuradio/branches/developers/michaelld/am_swig_4/usrp/host/lib/legacy/usrp_standard.h:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/usrp/host/lib/legacy/usrp_standard.h:10540-10546
/gnuradio/branches/developers/trondeau/qt/usrp/host/lib/legacy/usrp_standard.h:11235-11360
/gnuradio/trunk/usrp/host/include/usrp/usrp_standard.h:11480-11507
   + 
/gnuradio/branches/developers/balister/arm-configure/usrp/host/include/usrp/usrp_standard.h:11398-11413
/gnuradio/branches/developers/eb/t348/usrp/host/lib/legacy/usrp_standard.h:10638-10648
/gnuradio/branches/developers/eb/t364/usrp/host/lib/legacy/usrp_standard.h:11016-11017
/gnuradio/branches/developers/eb/t367/usrp/host/lib/legacy/usrp_standard.h:11021-11025
/gnuradio/branches/developers/eb/t371/usrp/host/lib/legacy/usrp_standard.h:10958-10971
/gnuradio/branches/developers/eb/t378/usrp/host/lib/legacy/usrp_standard.h:10683-10688
/gnuradio/branches/developers/jblum/grc/usrp/host/lib/legacy/usrp_standard.h:10680-10938,11187-11273,11310-11357
/gnuradio/branches/developers/jblum/gui_guts/usrp/host/lib/legacy/usrp_standard.h:10464-10658
/gnuradio/branches/developers/jblum/vlen/usrp/host/lib/legacy/usrp_standard.h:10667-10677
/gnuradio/branches/developers/jblum/wxgui/usrp/host/lib/legacy/usrp_standard.h:11125-11183
/gnuradio/branches/developers/jcorgan/cpphier/usrp/host/lib/legacy/usrp_standard.h:10818-10858
/gnuradio/branches/developers/jcorgan/deb/usrp/host/lib/legacy/usrp_standard.h:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/branches/developers/jcorgan/fw-optimize/usrp/host/lib/legacy/usrp_standard.h:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/usrp/host/lib/legacy/usrp_standard.h:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/usrp/host/lib/legacy/usrp_standard.h:10771-10887
/gnuradio/branches/developers/jcorgan/np/usrp/host/lib/legacy/usrp_standard.h:11124-11148
/gnuradio/branches/developers/jcorgan/omni/usrp/host/include/usrp/usrp_standard.h:11463-11485
/gnuradio/branches/developers/jcorgan/pmt/usrp/host/include/usrp/usrp_standard.h:11492-11494
/gnuradio/branches/developers/jcorgan/pmt-gruel/usrp/host/include/usrp/usrp_standard.h:11453-11459
/gnuradio/branches/developers/jcorgan/t161/usrp/host/lib/legacy/usrp_standard.h:10876-10880
/gnuradio/branches/developers/michaelld/am_swig_4/usrp/host/lib/legacy/usrp_standard.h:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/usrp/host/lib/legacy/usrp_standard.h:10540-10546
/gnuradio/branches/developers/trondeau/qt/usrp/host/lib/legacy/usrp_standard.h:11235-11360
/gnuradio/trunk/usrp/host/include/usrp/usrp_standard.h:11480-11509


Property changes on: 
gnuradio/branches/developers/nldudok1/tvrx_mimo_merge_with_trunk/usrp/host/lib/gen-ratios
___________________________________________________________________
Modified: svn:mergeinfo
   - 
/gnuradio/branches/developers/balister/arm-configure/usrp/host/lib/gen-ratios:11398-11413
/gnuradio/branches/developers/eb/t348/usrp/host/lib/gen-ratios:10638-10648
/gnuradio/branches/developers/eb/t364/usrp/host/lib/gen-ratios:11016-11017
/gnuradio/branches/developers/eb/t367/usrp/host/lib/gen-ratios:11021-11025
/gnuradio/branches/developers/eb/t371/usrp/host/lib/gen-ratios:10958-10971
/gnuradio/branches/developers/eb/t378/usrp/host/lib/gen-ratios:10683-10688
/gnuradio/branches/developers/jblum/grc/usrp/host/lib/gen-ratios:10680-10938,11187-11273,11310-11357
/gnuradio/branches/developers/jblum/gui_guts/usrp/host/lib/gen-ratios:10464-10658
/gnuradio/branches/developers/jblum/vlen/usrp/host/lib/gen-ratios:10667-10677
/gnuradio/branches/developers/jblum/wxgui/usrp/host/lib/gen-ratios:11125-11183
/gnuradio/branches/developers/jcorgan/cpphier/usrp/host/lib/gen-ratios:10818-10858
/gnuradio/branches/developers/jcorgan/deb/usrp/host/lib/gen-ratios:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/branches/developers/jcorgan/fw-optimize/usrp/host/lib/gen-ratios:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/usrp/host/lib/gen-ratios:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/usrp/host/lib/gen-ratios:10771-10887
/gnuradio/branches/developers/jcorgan/np/usrp/host/lib/gen-ratios:11124-11148
/gnuradio/branches/developers/jcorgan/omni/usrp/host/lib/gen-ratios:11463-11485
/gnuradio/branches/developers/jcorgan/pmt/usrp/host/lib/gen-ratios:11492-11494
/gnuradio/branches/developers/jcorgan/pmt-gruel/usrp/host/lib/gen-ratios:11453-11459
/gnuradio/branches/developers/jcorgan/t161/usrp/host/lib/gen-ratios:10876-10880
/gnuradio/branches/developers/michaelld/am_swig_4/usrp/host/lib/gen-ratios:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/usrp/host/lib/gen-ratios:10540-10546
/gnuradio/branches/developers/trondeau/qt/usrp/host/lib/gen-ratios:11235-11360
/gnuradio/trunk/usrp/host/lib/gen-ratios:11480-11507
   + 
/gnuradio/branches/developers/balister/arm-configure/usrp/host/lib/gen-ratios:11398-11413
/gnuradio/branches/developers/eb/t348/usrp/host/lib/gen-ratios:10638-10648
/gnuradio/branches/developers/eb/t364/usrp/host/lib/gen-ratios:11016-11017
/gnuradio/branches/developers/eb/t367/usrp/host/lib/gen-ratios:11021-11025
/gnuradio/branches/developers/eb/t371/usrp/host/lib/gen-ratios:10958-10971
/gnuradio/branches/developers/eb/t378/usrp/host/lib/gen-ratios:10683-10688
/gnuradio/branches/developers/jblum/grc/usrp/host/lib/gen-ratios:10680-10938,11187-11273,11310-11357
/gnuradio/branches/developers/jblum/gui_guts/usrp/host/lib/gen-ratios:10464-10658
/gnuradio/branches/developers/jblum/vlen/usrp/host/lib/gen-ratios:10667-10677
/gnuradio/branches/developers/jblum/wxgui/usrp/host/lib/gen-ratios:11125-11183
/gnuradio/branches/developers/jcorgan/cpphier/usrp/host/lib/gen-ratios:10818-10858
/gnuradio/branches/developers/jcorgan/deb/usrp/host/lib/gen-ratios:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/branches/developers/jcorgan/fw-optimize/usrp/host/lib/gen-ratios:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/usrp/host/lib/gen-ratios:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/usrp/host/lib/gen-ratios:10771-10887
/gnuradio/branches/developers/jcorgan/np/usrp/host/lib/gen-ratios:11124-11148
/gnuradio/branches/developers/jcorgan/omni/usrp/host/lib/gen-ratios:11463-11485
/gnuradio/branches/developers/jcorgan/pmt/usrp/host/lib/gen-ratios:11492-11494
/gnuradio/branches/developers/jcorgan/pmt-gruel/usrp/host/lib/gen-ratios:11453-11459
/gnuradio/branches/developers/jcorgan/t161/usrp/host/lib/gen-ratios:10876-10880
/gnuradio/branches/developers/michaelld/am_swig_4/usrp/host/lib/gen-ratios:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/usrp/host/lib/gen-ratios:10540-10546
/gnuradio/branches/developers/trondeau/qt/usrp/host/lib/gen-ratios:11235-11360
/gnuradio/trunk/usrp/host/lib/gen-ratios:11480-11509