Lindsey Heagy ac008e7253 Merge branch 'em/dev' into em/rx ...

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

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

..

__init__.py

SurveyFDEM --> Survey, FieldsFDEM --> Fields

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

FDEM.py

Merge branch 'em/dev' into em/rx

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

FieldsFDEM.py

adjoint debugging

2016-02-21 11:33:15 -08:00

SrcFDEM.py

include mu in testing, cleanup and debugging in dipole sources

2016-02-21 10:36:46 -08:00

SurveyFDEM.py

Merge branch 'em/dev' into em/rx

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