merge master

2017-12-29 09:13:15 -08:00
parent bd197877ca e1b50439c9
commit f6dc9be122
55 changed files with 297 additions and 290 deletions
--- a/4
+++ b/4
@@ -38,7 +38,11 @@ PROJECT_NAME           = "TinyXML-2"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.

+<<<<<<< HEAD
 PROJECT_NUMBER = 5.0.1
+=======
+PROJECT_NUMBER = 6.0.0
+>>>>>>> master

 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a