diff options
author | Johnathan Corgan <johnathan@corganlabs.com> | 2017-03-16 22:27:04 -0700 |
---|---|---|
committer | Johnathan Corgan <johnathan@corganlabs.com> | 2017-03-16 22:27:04 -0700 |
commit | ffa0822abf7a30f9b44b3fb046cb6d723c4d8c37 (patch) | |
tree | 0e2d7be7824e91cf037f275098e1f90561fdafec /docs/doxygen/Doxyfile.in | |
parent | 00e775ff3e78f9e0fd216e683c958ed820363fac (diff) | |
parent | b675ccc2fd08574c3169659003290327b63aa16b (diff) |
Merge branch 'next' into python3
Conflicts:
gr-blocks/swig/blocks_swig.py.in
gr-uhd/apps/uhd_app.py
Diffstat (limited to 'docs/doxygen/Doxyfile.in')
-rw-r--r-- | docs/doxygen/Doxyfile.in | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/docs/doxygen/Doxyfile.in b/docs/doxygen/Doxyfile.in index fa4cb7ebb8..830bf54e9f 100644 --- a/docs/doxygen/Doxyfile.in +++ b/docs/doxygen/Doxyfile.in @@ -700,7 +700,8 @@ WARN_LOGFILE = # with spaces. INPUT = @top_srcdir@ \ - @top_builddir@ + @top_builddir@ \ + @top_srcdir@/docs/doxygen/other/license.dox # This tag can be used to specify the character encoding of the source files # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is |