Rowan Cockett 67d3cb4d9b Merge branch 'dev' of https://github.com/simpeg/simpeg into feat/treeMeshCounting ...

Conflicts:
	.travis.yml
	SimPEG/Utils/__init__.py

2016-01-28 14:26:21 -08:00

..

base

Separate tests into folders.

2015-10-30 13:39:01 -07:00

em

Decrease the number of iterations on the EM derivatives.

2016-01-03 19:11:45 -08:00

examples

my_function.__name__ must be set to 'test_' for nosetests

2016-01-03 12:48:01 -08:00

flow

New Examples

2015-11-25 16:03:08 -08:00

mesh

Hopefully get a better error message on travis.

2016-01-28 13:58:32 -08:00

utils

added an __iadd__, __isub__ to zero class

2015-11-24 10:05:28 -08:00

__init__.py

Separate tests into folders.

2015-10-30 13:39:01 -07:00