Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of ettus.sourcerepo.com:ettus/uhdpriv into flow_ctrl | Nick Foster | 2010-11-17 | 1 | -8/+7 |
| | | | | | | | | Conflicts: host/lib/transport/udp_simple.cpp host/lib/usrp/usrp2/mboard_impl.cpp host/lib/usrp/usrp2/usrp2_iface.cpp host/lib/usrp/usrp2/usrp2_regs.hpp | ||||
* | usrp-n: renamed docs and burner app, added burner app documentation | Josh Blum | 2010-11-11 | 1 | -0/+246 |