Merge branch 'charm-mpi-interop' of charmgit:charm into charm
authorNikhil Jain <nikhil@illinois.edu>
Sat, 31 Mar 2012 23:05:38 +0000 (18:05 -0500)
committerNikhil Jain <nikhil@illinois.edu>
Sat, 31 Mar 2012 23:05:38 +0000 (18:05 -0500)
commit90a85b68da360ff0bd5cd8feaff5d656df2d2212
tree821bb6ef711bfcf534bb6e7caf2fc801747285a2
parent5e39c8f5499f52fa6a053f5192ecdbe24c450ace
parente940e08d96a39cb44aed9da493dd381154d83ded
Merge branch 'charm-mpi-interop' of charmgit:charm into charm
src/ck-core/init.C
src/conv-core/convcore.c