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

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

2016-05-26 09:25:43 -07:00

..

Analytics

Incorporate Lindsey's comments on documenting codes

2016-05-25 23:28:58 -07:00

FDEM

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

2016-05-26 09:25:43 -07:00

Static

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

2016-05-25 14:22:58 -07:00

TDEM

working dc fwd

2016-04-15 16:53:43 -07:00

Utils

simple field receivers are Point receivers

2016-05-11 09:05:13 -07:00

__init__.py

working dc fwd

2016-04-15 16:53:43 -07:00

Base.py

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

2016-05-26 09:25:43 -07:00