wassname/simpeg
1
0
Fork 0
mirror of https://github.com/wassname/simpeg.git synced 2026-08-07 11:28:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into docs

Browse Source 
# Conflicts:
#	SimPEG/Mesh/TensorMesh.py
This commit is contained in:
Lindsey Heagy
2016-03-29 22:53:16 -07:00
parent b5b70390cb b4f329f65a
commit 021e7c794c
19 changed files with 2164 additions and 1255 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/conf.py
+2 -2
View File
@@ -51,9 +51,9 @@ copyright = u'2013, SimPEG Developers'
# built documents.
#
# The short X.Y version.
version = '0.1.9'
version = '0.1.10'
# The full version, including alpha/beta/rc tags.
release = '0.1.9'
release = '0.1.10'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.