[Commit-gnuradio] [gnuradio] 66/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 3bdbd3571fecb7edb03c41fe4139fd7d1823531c
Merge: a616ef1 c211688
Author: Josh Blum <address@hidden>
Date:   Fri Dec 11 18:34:18 2009 -0800

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

 usrp2/fpga/top/u2_core/u2_core.v  | 30 +++++++++++++++++++-----------
 usrp2/fpga/vrt/vita_tx_control.v  | 18 +++++++++++++++---
 usrp2/fpga/vrt/vita_tx_deframer.v | 10 ++++++++--
 3 files changed, 42 insertions(+), 16 deletions(-)