1 Commits

Author SHA1 Message Date
Lindsey Heagy ae9ca6cec9 Merge branch 'feat/sparse-regularization' into patch/sparse-dcip
# Conflicts:
#	SimPEG/Examples/__init__.py
#	SimPEG/Optimization.py
2016-04-06 14:53:45 -07:00