diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2012-09-06 12:01:23 -0400 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2012-09-06 12:01:23 -0400 |
| commit | c9dc582402d2551ead29a60256fdf64a1d43534c (patch) | |
| tree | 4e9fe56c173a8e080c84c4c113a5ac5c5f1c236c /docs/doxygen/Doxyfile.in | |
| parent | 1300d48af4752037feac4fae7c3c64187cc0a5a8 (diff) | |
| parent | a4e2e8a9a2c8a6bbd6d676a17b0e2732e11af09f (diff) | |
Merge branch 'master' into gr_log
Conflicts:
CMakeLists.txt
cmake/Modules/GrMiscUtils.cmake
docs/doxygen/other/build_guide.dox
gnuradio-core/CMakeLists.txt
gr-digital/lib/CMakeLists.txt
Diffstat (limited to 'docs/doxygen/Doxyfile.in')
| -rw-r--r-- | docs/doxygen/Doxyfile.in | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/docs/doxygen/Doxyfile.in b/docs/doxygen/Doxyfile.in index f3485316c4..ad3c2d01f4 100644 --- a/docs/doxygen/Doxyfile.in +++ b/docs/doxygen/Doxyfile.in @@ -628,7 +628,6 @@ EXCLUDE = @abs_top_builddir@/docs/doxygen/html \ @abs_top_builddir@/gr-gsm-fr-vocoder/src/lib/gsm_full_rate.py \ @abs_top_builddir@/gr-gsm-fr-vocoder/src/python/encdec.py \ @abs_top_builddir@/gr-howto-write-a-block \ - @abs_top_builddir@/gr-howto-write-a-block-cmake \ @abs_top_builddir@/gr-pager/src/pager_swig.py \ @abs_top_builddir@/gr-trellis/doc \ @abs_top_builddir@/gr-trellis/src/lib/generate_all.py \ @@ -640,7 +639,7 @@ EXCLUDE = @abs_top_builddir@/docs/doxygen/html \ @abs_top_builddir@/_CPack_Packages \ @abs_top_srcdir@/cmake \ @abs_top_srcdir@/gr-qtgui/lib \ - @abs_top_srcdir@/gr-howto-write-a-block-cmake + @abs_top_srcdir@/gr-howto-write-a-block # The EXCLUDE_SYMLINKS tag can be used select whether or not files or # directories that are symbolic links (a Unix filesystem feature) are excluded |