[Commit-gnuradio] [gnuradio] 73/148: Merge branch 'vita_rx' of http://gnuradio.org/git/matt into wip/usrp2

[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 0608a02531b70042201c45266a7070bcd6b91a68
Merge: 242b398 da59533
Author: Josh Blum <address@hidden>
Date:   Mon Dec 14 10:51:49 2009 -0800

    Merge branch 'vita_rx' of http://gnuradio.org/git/matt into wip/usrp2

 usrp2/fpga/top/u2_core/u2_core.v  | 33 +++++++++++++++++++++------------
 usrp2/fpga/vrt/vita_tx_control.v  | 18 +++++++++++++++---
 usrp2/fpga/vrt/vita_tx_deframer.v | 12 +++++++++---
 3 files changed, 45 insertions(+), 18 deletions(-)