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

Conflicts:
	.gitignore
	SimPEG/utils/__init__.py
This commit is contained in:
Rowan Cockett
2013-11-12 11:24:40 -08:00
7 changed files with 186 additions and 383 deletions
+2
View File
@@ -1,4 +1,6 @@
*.pyc
*.so
*.sublime-project
*.sublime-workspace
docs/_build/
myNotebooks/*