diff options
| author | Josh Blum | 2011-09-28 22:59:51 -0700 |
|---|---|---|
| committer | Josh Blum | 2011-09-28 22:59:51 -0700 |
| commit | b06328b4adee941fe62f12a848cc903097711bdd (patch) | |
| tree | fa8b6d5aaadd6bb70786e57891b52a7a17b0b3f6 /docs | |
| parent | 3f7db0afa99caeecb18428d7514dadd380d88d56 (diff) | |
| parent | 3e8c3125da6234c4d1f8c0eaf869bc86923cb292 (diff) | |
| download | gnuradio-b06328b4adee941fe62f12a848cc903097711bdd.tar.gz gnuradio-b06328b4adee941fe62f12a848cc903097711bdd.tar.bz2 gnuradio-b06328b4adee941fe62f12a848cc903097711bdd.zip | |
Merge branch 'digital' of https://github.com/trondeau/gnuradio into digital
Conflicts:
gr-digital/lib/Makefile.am
gr-digital/python/__init__.py
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/doxygen/Doxyfile.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/doxygen/Doxyfile.in b/docs/doxygen/Doxyfile.in index f12dd61b7..1f544e5bd 100644 --- a/docs/doxygen/Doxyfile.in +++ b/docs/doxygen/Doxyfile.in @@ -552,7 +552,7 @@ WARN_LOGFILE = # directories like "/usr/src/myproject". Separate the files or directories # with spaces. -INPUT = @top_srcdir@ +INPUT = @top_srcdir@ @top_builddir@ # 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 |