Merge branch 'master' into sphinx-docs

This commit is contained in:
Cadel Watson
2017-01-19 08:48:54 +11:00
38 changed files with 1278 additions and 174 deletions

6
.gitignore vendored
View File

@@ -1,13 +1,15 @@
*~
*.egg-info
*.egg
*.eggs
*.pyc
.coverage
.coverage.*
coverage
.tox
settings.py
*.pyc
.idea/*
.cache/*
.python-version
docs/_build/
docs/_api/
docs/_api/