diff options
| author | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2015-10-13 12:49:58 +0000 |
|---|---|---|
| committer | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2015-10-13 12:49:58 +0000 |
| commit | f23994c41f3d943fae980693d9cd832820fcee42 (patch) | |
| tree | 8555902995899046ae523e317d44e8946a85c1a8 /src/Doxyfile | |
| parent | c14909eae41883308428095758360de3a7202a0d (diff) | |
| parent | 6fd64ffb734f09eeb40aade1efa2e03666eb65b9 (diff) | |
Backmerge from trunk
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/alphashapes@853 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Former-commit-id: 3f1b56bf4986df7bb2938ea2fff944eb9bf9b653
Diffstat (limited to 'src/Doxyfile')
| -rw-r--r-- | src/Doxyfile | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/Doxyfile b/src/Doxyfile index 0724de1c..90884779 100644 --- a/src/Doxyfile +++ b/src/Doxyfile @@ -832,10 +832,16 @@ EXAMPLE_RECURSIVE = NO # that contain images that are to be included in the documentation (see the # \image command). +<<<<<<< .working IMAGE_PATH = doc/Skeleton_blocker/ \ doc/Alpha_complex/ \ doc/common/ \ doc/Contraction/ +======= +IMAGE_PATH = doc/Skeleton_blocker/ \ + doc/common/ \ + doc/Contraction/ +>>>>>>> .merge-right.r851 # The INPUT_FILTER tag can be used to specify a program that doxygen should |