D Fournier 9d4e2488f3 Merge branch 'dcip/dev' of https://github.com/simpeg/simpeg into dcip/dev ...

Conflicts:
	SimPEG/DCIP/DCIPUtils.py

2016-03-10 14:33:06 -08:00

..

__init__.py

Move stuff to DCIPUtils.py

2016-02-11 14:10:44 -08:00

BaseDC.py

projectFields --> eval

2016-03-01 18:02:33 -08:00

BaseIP.py

Move stuff to DCIPUtils.py

2016-02-11 14:10:44 -08:00

DCIPUtils.py

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

2016-03-10 14:33:06 -08:00

Utils.py

Updates to SimPEG.DCIP

2016-02-05 15:09:52 -08:00