Shifted all Doxygen pages back from docs/html/... to html/...; added …

…a submodule for gh-pages so that updates to the Doxygen are more easily incorporated; added Doxygen page back into the wiki
Calvin-CS · Jul 24, 2015 · 4c2aed1 · 4c2aed1
1 parent b915b9c
commit 4c2aed1
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 2 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,7 @@
 [submodule "docs-wiki"]
 	path = docs-wiki
 	url = git@github.com:Calvin-CS/TSGL.wiki.git
+[submodule "docs"]
+	path = docs
+	url = git@github.com:Calvin-CS/TSGL.git
+	branch = gh-pages
diff --git a/docs b/docs
diff --git a/docs-wiki b/docs-wiki
diff --git a/readme.md b/readme.md
@@ -3,7 +3,7 @@ TSGL
 
 Thread Safe Graphics Library
 
-You can generate Doxygen locally using 'make docs', or view the [latest Doxygen documentation here](http://calvin-cs.github.io/TSGL/docs/html/index.html).
+You can generate Doxygen locally using 'make docs', or view the [latest Doxygen documentation here](http://calvin-cs.github.io/TSGL/html/index.html).
 
 ------------
 Description