Merge branch 'issue11' into devel
Conflicts: docs/source/introduction.rst
This commit is contained in:
commit
56e76aac03
11 changed files with 667 additions and 61 deletions
|
|
@ -78,7 +78,7 @@ copyright = u'2013, John Evans'
|
|||
# The short X.Y version.
|
||||
version = '0.1'
|
||||
# The full version, including alpha/beta/rc tags.
|
||||
release = '0.1.3p1'
|
||||
release = '0.1.4'
|
||||
|
||||
# The language for content autogenerated by Sphinx. Refer to documentation
|
||||
# for a list of supported languages.
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue