Commit Graph

1 Commits

Author SHA1 Message Date
seogi_macbook 774d612c18 Merge branch 'master' of https://github.com/simpeg/simpeg into Examples
Conflicts:
	SimPEG/Examples/__init__.py
2016-02-10 23:38:51 -08:00