diff options
author | Ashish Chaudhari <ashish@ettus.com> | 2015-03-30 16:56:01 -0700 |
---|---|---|
committer | Ashish Chaudhari <ashish@ettus.com> | 2015-03-30 16:56:01 -0700 |
commit | 700bf99bdc483fdcc9deb54abc29bd7f81e16089 (patch) | |
tree | 42d4f30e7a4abc9e47dcd01300a2f44ab1b91510 /host/docs | |
parent | 6a34824ad10eaa2d2b642b959f278f6c4e326d6d (diff) | |
parent | 61599b3eaadcc46ac8d24974176d7fd89778d06e (diff) | |
download | uhd-700bf99bdc483fdcc9deb54abc29bd7f81e16089.tar.gz uhd-700bf99bdc483fdcc9deb54abc29bd7f81e16089.tar.bz2 uhd-700bf99bdc483fdcc9deb54abc29bd7f81e16089.zip |
Merge branch 'master' into ashish/vivado
Diffstat (limited to 'host/docs')
-rw-r--r-- | host/docs/Doxyfile.in | 3 | ||||
-rw-r--r-- | host/docs/res/e3x0_imu_demo.png (renamed from host/docs/e3x0_imu_demo.png) | bin | 85901 -> 85901 bytes |
2 files changed, 2 insertions, 1 deletions
diff --git a/host/docs/Doxyfile.in b/host/docs/Doxyfile.in index 6d38a9a79..b0490c5c0 100644 --- a/host/docs/Doxyfile.in +++ b/host/docs/Doxyfile.in @@ -686,7 +686,8 @@ RECURSIVE = YES # Note that relative paths are relative to the directory from which doxygen is # run. -EXCLUDE = +EXCLUDE = @CMAKE_SOURCE_DIR@/include/uhd/transport/nirio \ + @CMAKE_SOURCE_DIR@/include/uhd/transport/nirio_zero_copy.hpp # The EXCLUDE_SYMLINKS tag can be used to select whether or not files or # directories that are symbolic links (a Unix file system feature) are excluded diff --git a/host/docs/e3x0_imu_demo.png b/host/docs/res/e3x0_imu_demo.png Binary files differindex cbf156224..cbf156224 100644 --- a/host/docs/e3x0_imu_demo.png +++ b/host/docs/res/e3x0_imu_demo.png |