Commit Graph

5 Commits

Author SHA1 Message Date
Rowan Cockett 40f0874dfb Doc testing, I think that is most of them! 2016-05-29 22:18:22 -07:00
Rowan Cockett 18f98b2ecd Merge branch 'docs' of https://github.com/simpeg/simpeg into feat/docs-deploy
# Conflicts:
#	SimPEG/Utils/meshutils.py
#	docs/api_Utils.rst
#	docs/conf.py
#	docs/flow/index.rst
2016-05-29 19:18:36 -07:00
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
Lindsey Heagy 029171fb1d use .format for strings 2016-05-11 09:09:26 -07:00
Lindsey Heagy 11e6b452c9 renamed FDEM.py to ProblemFDEM.py, changed real_or_imag to component 2016-05-10 17:26:16 -07:00