Lindsey Heagy 999a37547e Merge branch 'dev' into docs ...

# Conflicts:
#	.travis.yml
#	SimPEG/EM/FDEM/FDEM.py
#	SimPEG/Mesh/TensorMesh.py

2016-02-09 08:32:41 -08:00

..

Analytics

Updates to the documentation.

2016-01-10 17:21:01 -08:00

FDEM

Merge branch 'dev' into docs

2016-02-09 08:32:41 -08:00

TDEM

Fixes #215

2016-01-28 22:33:04 -08:00

Utils

SurveyFDEM --> Survey, FieldsFDEM --> Fields

2015-11-17 22:17:38 -08:00

__init__.py

from SimPEG.EM import mu_0

2016-01-28 23:44:02 -08:00

Base.py

Merge branch 'master' of https://github.com/simpeg/simpegem into em/dev

2015-11-04 09:59:11 -08:00