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

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

2016-03-29 22:59:01 -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-29 22:59:01 -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

prim-sec for EB formulation on same meshes

2016-03-29 09:59:13 -07:00

__init__.py

from SimPEG.EM import mu_0

2016-01-28 23:44:02 -08:00

Base.py

Merge branch 'em/dev' into em/primsec

2016-03-29 22:59:01 -07:00