diff options
author | Martin Braun <martin.braun@ettus.com> | 2015-04-30 12:41:29 -0700 |
---|---|---|
committer | Martin Braun <martin.braun@ettus.com> | 2015-04-30 12:41:29 -0700 |
commit | c6d0daaf034f3c1f20b8a0e6cd5c2555879760e2 (patch) | |
tree | 4eafe1986aeb28a495a7ad52d1c2a303fbfa2bd6 /host/docs | |
parent | 121fbf3795332fb86ac24a4174e707a26265e982 (diff) | |
parent | 7af2e970379fb8f58c8afbc99b1498e42698c0a5 (diff) | |
download | uhd-c6d0daaf034f3c1f20b8a0e6cd5c2555879760e2.tar.gz uhd-c6d0daaf034f3c1f20b8a0e6cd5c2555879760e2.tar.bz2 uhd-c6d0daaf034f3c1f20b8a0e6cd5c2555879760e2.zip |
Merge branch 'maint'
Conflicts:
fpga-src
host/CMakeLists.txt
Diffstat (limited to 'host/docs')
-rw-r--r-- | host/docs/CMakeLists.txt | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/host/docs/CMakeLists.txt b/host/docs/CMakeLists.txt index a73d39356..eb4b67c29 100644 --- a/host/docs/CMakeLists.txt +++ b/host/docs/CMakeLists.txt @@ -55,7 +55,6 @@ IF(ENABLE_MANUAL) SET(DOXYGEN_FPGA_MANUAL_REFERENCE "\\subpage md_fpga \"Part III: FPGA Manual\"") SET(DOXYGEN_STRIP_EXTRA "${FPGA_SUBMODULE_DIR}/docs") ENDIF(HAS_FPGA_SUBMODULE) - message(STATUS ${manual_sources}) CONFIGURE_FILE( ${CMAKE_CURRENT_SOURCE_DIR}/mainpage.dox.in ${CMAKE_CURRENT_BINARY_DIR}/mainpage.dox |