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

Conflicts:
	SimPEG/Regularization.py

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

..

__init__.py

Merge branch 'master' of https://github.com/simpeg/simpegem into em/dev

2015-11-04 09:59:11 -08:00

BaseTDEM.py

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

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

SurveyTDEM.py

- rx.projectFields --> rx.eval

2016-02-21 15:31:02 -08:00

TDEM_b.py

Merge branch 'master' of https://github.com/simpeg/simpegem into em/dev

2015-11-04 09:59:11 -08:00