Commit Graph

4 Commits

Author SHA1 Message Date
Lindsey Heagy 7023e999bc SurveyFDEM --> Survey, FieldsFDEM --> Fields 2015-11-17 22:17:38 -08:00
Lindsey Heagy c041ad3de6 EM.FDEM.RxFDEM --> EM.FDEM.Rx 2015-11-17 08:29:27 -08:00
Lindsey Heagy 19bcdbfbf5 EM.FDEM.SrcFDEM_XXX --> EM.FDEM.Src.XXX 2015-11-13 10:39:08 -08:00
Rowan Cockett e622dfb5cc Merge branch 'master' of https://github.com/simpeg/simpegem into em/dev
Conflicts:
	.coveragerc
	.gitignore
	.travis.yml
	docs/api_Utils.rst
	docs/conf.py
	docs/index.rst
	requirements.txt
	setup.py
2015-11-04 09:59:11 -08:00