[Commit-gnuradio] [gnuradio] 74/148: Merge branch 'wip/usrp2' of address@hidden:jblum 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 b4af1374fddb5bfd35708a7aaaadd464ce7405b4
Merge: 0608a02 48ac177
Author: Josh Blum <address@hidden>
Date:   Mon Dec 14 17:02:45 2009 -0800

    Merge branch 'wip/usrp2' of address@hidden:jblum into wip/usrp2

 usrp2/firmware/apps/txrx.c      |  2 +-
 usrp2/firmware/lib/dbsm.c       |  6 +++---
 usrp2/firmware/lib/memory_map.h | 16 +++++++++++-----
 3 files changed, 15 insertions(+), 9 deletions(-)