wassname/simpeg
1
0
Fork 0
mirror of https://github.com/wassname/simpeg.git synced 2026-06-28 02:47:11 +08:00
Code Issues Packages Projects Releases Wiki Activity
2,270 Commits 28 Branches 6 Tags
master
Commit Graph

2 Commits

Author SHA1 Message Date
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