2 Commits

Author SHA1 Message Date
Thibaut Astic 45c4fa0d95 Merge branch 'master' into ex/mt1d
# Conflicts:
#	SimPEG/Examples/__init__.py
2016-04-07 11:09:07 -07:00
Rowan Cockett 91284e2286 Edge Bug 2015-11-07 18:34:50 -08:00