 Lindsey Heagy
|
def4b01080
|
Merge branch 'dev' into ex/mt1d
# Conflicts:
# SimPEG/Examples/MT_1D_analytic_nlayer_Earth.py
# SimPEG/Examples/__init__.py
# SimPEG/Examples/sphereElectrostatic_example.py
# SimPEG/Optimization.py
# docs/examples/DC_PseudoSection_Simulation.rst
# docs/examples/Inversion_IRLS.rst
# docs/examples/MT_1D_analytic_nlayer_Earth.rst
|
2016-05-18 09:13:35 -07:00 |
|