Commit 9aa680c4 authored by Ultima's avatar Ultima
Browse files

Merge branch 'mpi' of https://bitbucket.org/ultimanet/nifty into mpi

Conflicts:
	nifty_mpi_data.py
parents ab17454d 7aa289ea
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment