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

Conflicts:
	.gitignore
	SimPEG/utils/__init__.py
This commit is contained in:
Rowan Cockett committed 2013-11-12 11:24:40 -08:00
commit 1f13a74bb9
7 files changed
+186 -383

No files matched your search

+2
View File
@@ -1,4 +1,6 @@
*.pyc
*.so
*.sublime-project
*.sublime-workspace
docs/_build/
myNotebooks/*