Merge branch 'master' into richardgv-dev

Merged the documentation changes. Program code unchanged.
This commit is contained in:
Richard Grenville
2012-10-29 09:53:38 +08:00
6 changed files with 288 additions and 90 deletions

3
.gitignore vendored
View File

@ -23,7 +23,8 @@ release/
_CPack_Packages/
CMakeCache.txt
CMakeFiles/
*.cmake
cmake_install.cmake
CPackSourceConfig.cmake
install_manifest.txt