[Commit-gnuradio] [gnuradio] 65/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 b3fdfa1d967220b2fbf1d1a960734d9fff743439
Merge: 11f67cb c211688
Author: Matt Ettus <address@hidden>
Date:   Fri Dec 11 18:32:58 2009 -0800

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

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