Files
simpeg/SimPEG/regularization
Rowan Cockett 82edbf7a60 Merge branch 'master' of https://bitbucket.org/rcockett/simpeg into richards
Conflicts:
	SimPEG/inverse/Optimize.py
	SimPEG/regularization/Regularization.py
2013-11-21 11:56:12 -08:00
..
2013-10-22 20:11:30 -07:00