diff options
| author |  Craig Tiller <craig.tiller@gmail.com> | 2015-06-25 07:00:18 -0700 |
|---|---|---|
| committer | Craig Tiller <craig.tiller@gmail.com> | 2015-06-25 07:00:18 -0700 |
| commit | fe8592ee994343821c8c4e906ee3bef3b4444e34 (patch) | |
| tree | a0f1fa88e0ddeb4092567adc51184ac88f0ab78b /templates/tools/doxygen/Doxyfile.include | |
| parent | f75fc12e3a1a614ee2d5d565742764e47d9aef96 (diff) | |
| parent | 0bf7e48ade52eec336f50dee4c7d22eeb887bb8e (diff) | |
Merge github.com:grpc/grpc into are-includes-sane
Conflicts:
tools/doxygen/Doxyfile.c++.internal
Diffstat (limited to 'templates/tools/doxygen/Doxyfile.include')
| -rw-r--r-- | templates/tools/doxygen/Doxyfile.include | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/templates/tools/doxygen/Doxyfile.include b/templates/tools/doxygen/Doxyfile.include index 1391016348..2934ebe7d8 100644 --- a/templates/tools/doxygen/Doxyfile.include +++ b/templates/tools/doxygen/Doxyfile.include @@ -778,7 +778,7 @@ WARN_LOGFILE = # spaces. # Note: If this tag is empty the current directory is searched. -INPUT = ${' '.join( +INPUT = ${' \\\n'.join( itertools.chain.from_iterable( target.public_headers + ([] |