Rowan Cockett 8a8ccebe3a Merge branch 'master' of https://github.com/simpeg/simpegMT into develop ...

Conflicts:
	simpegMT/Base.pyc
	simpegMT/Utils/MT1Danalytic.pyc
	simpegMT/Utils/MT1Dsolutions.pyc
	simpegMT/Utils/__init__.pyc
	simpegMT/__init__.pyc

2015-02-12 11:47:09 -08:00

..

__init__.py

delete analytics folder.

2015-02-12 11:40:13 -08:00

__init__.pyc

remove the rest of the pyc files.

2015-02-12 11:34:47 -08:00

MT1Danalytic.py

move analytics to utils.

2015-02-12 11:39:13 -08:00

MT1Danalytic.pyc

remove the rest of the pyc files.

2015-02-12 11:34:47 -08:00

MT1Dsolutions.py

move analytics to utils.

2015-02-12 11:39:13 -08:00

MT1Dsolutions.pyc

remove the rest of the pyc files.

2015-02-12 11:34:47 -08:00