[Commit-gnuradio] [gnuradio] 114/148: Merge branch 'wip/usrp2' 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 5b082ef33bd2a3f6469b727ddba4f59064d97467
Merge: 5d21a64 f996ba2
Author: Josh Blum <address@hidden>
Date:   Tue Jan 5 14:40:26 2010 -0800

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

 usrp2/fpga/timing/time_64bit.v   | 33 +++++++++++++++++++++++++++++----
 usrp2/fpga/top/u2_core/u2_core.v |  2 +-
 2 files changed, 30 insertions(+), 5 deletions(-)