From 06d7452697eabd7337cfa2604b2b1196298bf7aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20M=C3=B6bius?= <moebius@cs.rwth-aachen.de>
Date: Fri, 16 May 2014 13:53:55 +0000
Subject: [PATCH] Updated changelog, updated doxyfile to 1.8.6

git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@1064 fdac6126-5c0c-442c-9429-916003d36597
---
 Doc/changelog.docu                            | 11 +++++-
 Doc/doxy.config.in                            | 39 +++++++++++++++----
 ...nittests_trimesh_circulator_vertex_face.cc |  1 +
 3 files changed, 42 insertions(+), 9 deletions(-)

diff --git a/Doc/changelog.docu b/Doc/changelog.docu
index 0e5ee219..45c2c67e 100644
--- a/Doc/changelog.docu
+++ b/Doc/changelog.docu
@@ -7,13 +7,22 @@
 
 <!-- --------------------------------------------------------------------- -->
 
-<tr valign=top><td><b>3.2</b> (?/?/?,Rev.1052)</td><td>
+<tr valign=top><td><b>3.2</b> (?/?/?,Rev.1059)</td><td>
+
+<b>Core</b>
+<ul>
+<li>Fixed copy paste typos in the vertex face and face face range code</li>
+</ul>
 
 <b>IO</b>
 <ul>
 <li>Silence the readers/writers (Some of them always wrote output to command line).</li>
 </ul>
 
+<b>Documentation</b>
+<ul>
+<li>Updated doxyfile to 1.8.6</li>
+
 </tr>
 
 <tr valign=top><td><b>3.1</b> (2014/05/09,Rev.1050)</td><td>
diff --git a/Doc/doxy.config.in b/Doc/doxy.config.in
index 60132fcf..30383b80 100644
--- a/Doc/doxy.config.in
+++ b/Doc/doxy.config.in
@@ -1,4 +1,4 @@
-# Doxyfile 1.8.5
+# Doxyfile 1.8.6
 
 # This file describes the settings to be used by the documentation system
 # doxygen (www.doxygen.org) for a project.
@@ -73,12 +73,14 @@ CREATE_SUBDIRS         = NO
 # The OUTPUT_LANGUAGE tag is used to specify the language in which all
 # documentation generated by doxygen is written. Doxygen will use this
 # information to generate all constant output in the proper language.
-# Possible values are: Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-
-# Traditional, Croatian, Czech, Danish, Dutch, English, Esperanto, Farsi,
-# Finnish, French, German, Greek, Hungarian, Italian, Japanese, Japanese-en,
-# Korean, Korean-en, Latvian, Norwegian, Macedonian, Persian, Polish,
-# Portuguese, Romanian, Russian, Serbian, Slovak, Slovene, Spanish, Swedish,
-# Turkish, Ukrainian and Vietnamese.
+# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Catalan, Chinese,
+# Chinese-Traditional, Croatian, Czech, Danish, Dutch, English (United States),
+# Esperanto, Farsi (Persian), Finnish, French, German, Greek, Hungarian,
+# Indonesian, Italian, Japanese, Japanese-en (Japanese with English messages),
+# Korean, Korean-en (Korean with English messages), Latvian, Lithuanian,
+# Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, Romanian, Russian,
+# Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, Swedish, Turkish,
+# Ukrainian and Vietnamese.
 # The default value is: English.
 
 OUTPUT_LANGUAGE        = English
@@ -502,6 +504,13 @@ HIDE_SCOPE_NAMES       = NO
 
 SHOW_INCLUDE_FILES     = YES
 
+# If the SHOW_GROUPED_MEMB_INC tag is set to YES then Doxygen will add for each
+# grouped member an include statement to the documentation, telling the reader
+# which file to include in order to use the member.
+# The default value is: NO.
+
+SHOW_GROUPED_MEMB_INC  = NO
+
 # If the FORCE_LOCAL_INCLUDES tag is set to YES then doxygen will list include
 # files with double quotes in the documentation rather than with sharp brackets.
 # The default value is: NO.
@@ -523,7 +532,8 @@ SORT_MEMBER_DOCS       = YES
 
 # If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the brief
 # descriptions of file, namespace and class members alphabetically by member
-# name. If set to NO the members will appear in declaration order.
+# name. If set to NO the members will appear in declaration order. Note that
+# this will also influence the order of the classes in the class list.
 # The default value is: NO.
 
 SORT_BRIEF_DOCS        = NO
@@ -2036,6 +2046,13 @@ CLASS_DIAGRAMS         = YES
 
 MSCGEN_PATH            =
 
+# You can include diagrams made with dia in doxygen documentation. Doxygen will
+# then run dia to produce the diagram and insert it in the documentation. The
+# DIA_PATH tag allows you to specify the directory where the dia binary resides.
+# If left empty dia is assumed to be found in the default search path.
+
+DIA_PATH               =
+
 # If set to YES, the inheritance and collaboration graphs will hide inheritance
 # and usage relations if the target is undocumented or is not a class.
 # The default value is: YES.
@@ -2236,6 +2253,12 @@ DOTFILE_DIRS           =
 
 MSCFILE_DIRS           =
 
+# The DIAFILE_DIRS tag can be used to specify one or more directories that
+# contain dia files that are included in the documentation (see the \diafile
+# command).
+
+DIAFILE_DIRS           =
+
 # The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of nodes
 # that will be shown in the graph. If the number of nodes in a graph becomes
 # larger than this value, doxygen will truncate the graph, which is visualized
diff --git a/src/Unittests/unittests_trimesh_circulator_vertex_face.cc b/src/Unittests/unittests_trimesh_circulator_vertex_face.cc
index 4e617072..d1d3f45e 100644
--- a/src/Unittests/unittests_trimesh_circulator_vertex_face.cc
+++ b/src/Unittests/unittests_trimesh_circulator_vertex_face.cc
@@ -267,4 +267,5 @@ TEST_F(OpenMeshTrimeshCirculatorVertexFace, VertexFaceIterBoundaryIncrement) {
   EXPECT_FALSE(vf_it.is_valid()) << "Iterator invalid in VertexFaceIter at step 2";
   EXPECT_TRUE( vf_it == vf_end )  << "End iterator for VertexFaceIter not matching";
 }
+
 }