Merge branch 'master' into ejh_next_2

This commit is contained in:
Ed Hartnett 2018-11-07 14:32:23 -07:00 committed by GitHub
commit a5bb5fef65
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1,5 +1,3 @@
# Doxyfile 1.8.3, mixed with 1.8.6
# This file describes the settings to be used by the documentation system
# doxygen (www.doxygen.org) for a project.
#
@ -754,6 +752,7 @@ INPUT = \
@abs_top_srcdir@/docs/attribute_conventions.md \
@abs_top_srcdir@/docs/file_format_specifications.md \
@abs_top_srcdir@/docs/DAP2.dox \
@abs_top_srcdir@/docs/DAP4.dox \
@abs_top_srcdir@/docs/user_defined_formats.md \
@abs_top_srcdir@/docs/filters.md \
@abs_top_srcdir@/docs/inmemory.md \
@ -890,7 +889,7 @@ EXAMPLE_PATH = @abs_top_srcdir@/examples/C
# *.h) to filter out the source-files in the directories. If left blank all
# files are included.
EXAMPLE_PATTERNS =
EXAMPLE_PATTERNS =
# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
# searched for input files to be used with the \include or \dontinclude commands