Merge branch 'dev' into ref/dev

Conflicts:
	docs/examples/DC_Forward_PseudoSection.rst
This commit is contained in:
D Fournier
2016-05-27 11:10:39 -07:00
53 changed files with 4765 additions and 213 deletions
@@ -22,6 +22,7 @@ radi = Radius of spheres [r1,r2]
param = Conductivity of background and two spheres [m0,m1,m2]
surveyType = survey type 'pole-dipole' or 'dipole-dipole'
unitType = Data type "appResistivity" | "appConductivity" | "volt"
Created by @fourndo