Lindsey Heagy 52cc92f699 Merge branch 'dev' into em/dev ...

# Conflicts:
#	SimPEG/EM/FDEM/FDEM.py

2016-02-22 11:07:08 -08:00

..

Analytics

Updates to the documentation.

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

FDEM

Merge branch 'dev' into em/dev

2016-02-22 11:07:08 -08:00

TDEM

- rx.projectFields --> rx.eval

2016-02-21 15:31:02 -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