Merge branch 'charm' of charmgit:charm into charm-mpi-interop
authorNikhil Jain <nikhil@illinois.edu>
Sat, 31 Mar 2012 17:06:35 +0000 (12:06 -0500)
committerNikhil Jain <nikhil@illinois.edu>
Sat, 31 Mar 2012 17:06:35 +0000 (12:06 -0500)
commit416e12ff2c4a6f50554ce475e8c8f48c5b58022f
tree474e0683c6f1dd08d18c24cdd47ce960b31d730f
parent6c1fe3427140095ddada5dfe9d177b6c6781f508
parent4861187ec907784495e3ec79c54bd4befbc21e9b
Merge branch 'charm' of charmgit:charm into charm-mpi-interop

Conflicts:
src/conv-core/converse.h
src/arch/util/machine-common-core.c
src/ck-core/init.C
src/conv-core/converse.h