Commit Graph

4 Commits

Author SHA1 Message Date
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
Rowan Cockett 465087beba SimPEG.FLOW 2015-10-30 14:36:51 -07:00
Rowan Cockett 7106b2b57f Test examples 2015-10-30 13:59:25 -07:00
Rowan Cockett b8fe0cfdbf Separate tests into folders.
Build in a matrix?
2015-10-30 13:39:01 -07:00