diff options
| author | Nick Foster <nick@nerdnetworks.org> | 2010-11-17 18:31:21 -0800 |
|---|---|---|
| committer | Nick Foster <nick@nerdnetworks.org> | 2010-11-17 18:31:21 -0800 |
| commit | 95cf7753c175e868d1aacaad378bfe74d9454200 (patch) | |
| tree | 2eef9c811655d7a1b4d0fb020db7fa5125a2adc7 /host/docs/CMakeLists.txt | |
| parent | 81c9f77306dc82f250bfb2871b8bd7db67a40085 (diff) | |
| parent | 89ae5f3f651cff22226e2b2c0ce0ed796dad4c71 (diff) | |
| download | uhd-95cf7753c175e868d1aacaad378bfe74d9454200.tar.gz uhd-95cf7753c175e868d1aacaad378bfe74d9454200.tar.bz2 uhd-95cf7753c175e868d1aacaad378bfe74d9454200.zip | |
Merge branch 'master' of ettus.sourcerepo.com:ettus/uhdpriv into flow_ctrl
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
Diffstat (limited to 'host/docs/CMakeLists.txt')
| -rw-r--r-- | host/docs/CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/host/docs/CMakeLists.txt b/host/docs/CMakeLists.txt index 4d3269543..c649dbb61 100644 --- a/host/docs/CMakeLists.txt +++ b/host/docs/CMakeLists.txt @@ -28,7 +28,7 @@ SET(manual_sources images.rst transport.rst usrp1.rst - usrp2.rst + usrp_nxxx.rst ) ######################################################################## |