Lindsey Heagy d6daa93d9a Merge branch 'em/dev' into em/primsec ...

# Conflicts:
#	SimPEG/EM/FDEM/SrcFDEM.py
#	tests/em/fdem/inverse/adjoint/test_FDEM_adjointEB.py

2016-03-28 12:54:51 -07:00

..

__init__.py

SurveyFDEM --> Survey, FieldsFDEM --> Fields

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

FDEM.py

Merge branch 'em/dev' into em/primsec

2016-03-28 12:54:51 -07:00

FieldsFDEM.py

- _fieldType --> _solutionType

2016-03-07 13:31:15 -08:00

SrcFDEM.py

Merge branch 'em/dev' into em/primsec

2016-03-28 12:54:51 -07:00

SurveyFDEM.py

- _fieldType --> _solutionType

2016-03-07 13:31:15 -08:00