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

Conflicts:
	docs/api_TestResults.rst
This commit is contained in:
Rowan Cockett
2013-11-12 13:43:06 -08:00
20 changed files with 2004 additions and 913 deletions
+564 -378
View File
File diff suppressed because it is too large Load Diff
+1
View File
@@ -1,2 +1,3 @@
numpy
pypubsub
ipython