[Commit-gnuradio] [gnuradio] 68/148: Merge branch 'vita_rx' of gnuradio.org:matt into vita_rx

[git]

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

nwest pushed a commit to annotated tag old_usrp_devel_udp
in repository gnuradio.

commit 9dfaa90fb841a084299d7053a98d8141bffc9414
Merge: b3fdfa1 6ce6ca6
Author: Matt Ettus <address@hidden>
Date:   Fri Dec 11 18:39:00 2009 -0800

    Merge branch 'vita_rx' of gnuradio.org:matt into vita_rx

 usrp2/fpga/vrt/vita_tx_control.v  | 2 +-
 usrp2/fpga/vrt/vita_tx_deframer.v | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)