Merge branch 'master' of https://bitbucket.org/rcockett/simpeg into boundaryConditions

Conflicts:
	SimPEG/__init__.py
This commit is contained in:
Rowan Cockett
2013-11-18 12:33:09 -08:00
13 changed files with 692 additions and 12 deletions
+2 -1
View File
@@ -2,9 +2,10 @@ import utils
from utils import Solver
import mesh
import inverse
import visualize
import forward
import regularization
import examples
import scipy.version as _v
if _v.version < '0.13.0':