Merge conflicts.

google · Aug 28, 2013 · 17d5f7b · 17d5f7b
2 parents d184034 + fa69d0d
commit 17d5f7b
Show file tree

Hide file tree

Showing 148 changed files with 7 additions and 9,485 deletions.
diff --git a/Doxyfile b/Doxyfile
@@ -32,7 +32,7 @@ PROJECT_NAME           = "Gumbo"
 # This could be handy for archiving the generated documentation or
 # if some version control system is used.
 
-PROJECT_NUMBER         = 0.9.0
+PROJECT_NUMBER         = {{VERSION}}
 
 # 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

diff --git a/README.md b/README.md
@@ -151,7 +151,7 @@ External Bindings
 The following language bindings are maintained by various contributors in
 other repositories:
 
-* Ruby: 
+* Ruby:
   * [ruby-gumbo] by Nicolas Martyanoff
   * [nokogumbo] by Sam Ruby
 * Node.js: [node-gumbo-parser] by Karl Westin

diff --git a/docs/html/annotated.html b/docs/html/annotated.html
diff --git a/docs/html/bc_s.png b/docs/html/bc_s.png
diff --git a/docs/html/classes.html b/docs/html/classes.html
diff --git a/docs/html/closed.png b/docs/html/closed.png