diff options
| author | Nick Foster <nick@nerdnetworks.org> | 2010-09-15 14:58:44 -0700 |
|---|---|---|
| committer | Nick Foster <nick@nerdnetworks.org> | 2010-09-15 14:58:44 -0700 |
| commit | ed245848df8cc011ae8fe30833ecc28049139db5 (patch) | |
| tree | da03d37de541826df734e8ab87e0b6114595afc8 /host/docs/CMakeLists.txt | |
| parent | 44ac4461407aae3e26b218a1ab1bd27f893c5e96 (diff) | |
| parent | 72646d1960b0c979afec225e741d7d89a827c7d0 (diff) | |
| download | uhd-ed245848df8cc011ae8fe30833ecc28049139db5.tar.gz uhd-ed245848df8cc011ae8fe30833ecc28049139db5.tar.bz2 uhd-ed245848df8cc011ae8fe30833ecc28049139db5.zip | |
Merge branch 'master' of ettus.sourcerepo.com:ettus/uhdpriv into usrp2p
Conflicts:
host/lib/usrp/usrp2/CMakeLists.txt
host/lib/usrp/usrp2/mboard_impl.cpp
host/lib/usrp/usrp2/usrp2_regs.hpp
Diffstat (limited to 'host/docs/CMakeLists.txt')
| -rw-r--r-- | host/docs/CMakeLists.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/host/docs/CMakeLists.txt b/host/docs/CMakeLists.txt index b4383f88d..bbb8812b0 100644 --- a/host/docs/CMakeLists.txt +++ b/host/docs/CMakeLists.txt @@ -25,6 +25,7 @@ SET(manual_sources dboards.rst general.rst images.rst + usrp1.rst usrp2.rst ) |