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

..

Analytics

Updates to the documentation.

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

FDEM

Merge branch 'em/dev' into em/primsec

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

TDEM

Merge branch 'dcip/dev' of https://github.com/simpeg/simpeg into dcip/dev

2016-03-03 15:12:05 -08:00

Utils

Merge branch 'em/dev' into em/primsec

2016-03-28 12:54:51 -07: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