Commit Graph

4 Commits

Author SHA1 Message Date
Brendan Smithyman f7a70aa6a7 Possibly deal with a good chunk of the old_divs 2016-07-17 16:02:43 -05:00
Brendan Smithyman ca8d8f8c2d Futurize 1, futurize 2, pasteurize. 2016-07-16 14:17:02 -05:00
Rowan Cockett 4db756b060 simpegEM --> SimPEG.EM 2015-11-04 10:13:24 -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