Lindsey Heagy 021e7c794c Merge branch 'master' into docs ...

# Conflicts:
#	SimPEG/Mesh/TensorMesh.py

2016-03-29 22:53:16 -07:00

..

__init__.py

SurveyFDEM --> Survey, FieldsFDEM --> Fields

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

FDEM.py

Merge branch 'master' into docs

2016-03-29 22:53:16 -07:00

FieldsFDEM.py

- _fieldType --> _solutionType

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

SrcFDEM.py

eqlocs --> formulation in em

2016-03-06 21:01:58 -08:00

SurveyFDEM.py

- _fieldType --> _solutionType

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