Rowan Cockett e622dfb5cc Merge branch 'master' of https://github.com/simpeg/simpegem into em/dev ...

Conflicts:
	.coveragerc
	.gitignore
	.travis.yml
	docs/api_Utils.rst
	docs/conf.py
	docs/index.rst
	requirements.txt
	setup.py

2015-11-04 09:59:11 -08:00

..

Analytics

Merge branch 'master' of https://github.com/simpeg/simpegem into em/dev

2015-11-04 09:59:11 -08:00

Examples

Merge branch 'master' of https://github.com/simpeg/simpegem into em/dev

2015-11-04 09:59:11 -08:00

FDEM

Merge branch 'master' of https://github.com/simpeg/simpegem into em/dev

2015-11-04 09:59:11 -08:00

TDEM

Merge branch 'master' of https://github.com/simpeg/simpegem into em/dev

2015-11-04 09:59:11 -08:00

Utils

Merge branch 'master' of https://github.com/simpeg/simpegem into em/dev

2015-11-04 09:59:11 -08:00

__init__.py

Merge branch 'master' of https://github.com/simpeg/simpegem into em/dev

2015-11-04 09:59:11 -08:00

Base.py

Merge branch 'master' of https://github.com/simpeg/simpegem into em/dev

2015-11-04 09:59:11 -08:00