Lindsey Heagy 944fb1dfee Merge branch 'master' into em/primsec ...

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

2016-02-10 16:15:01 -08:00

..

__init__.py

SurveyFDEM --> Survey, FieldsFDEM --> Fields

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

FDEM.py

Merge branch 'master' into em/primsec

2016-02-10 16:15:01 -08:00

FieldsFDEM.py

cleanup of docs, docs for survey

2016-02-07 13:04:13 -08:00

SrcFDEM.py

Merge branch 'master' into em/primsec

2016-02-10 16:15:01 -08:00

SurveyFDEM.py

a couple typo fixes

2016-02-07 13:07:40 -08:00