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)
1  2 
src/ck-core/init.C
src/conv-core/convcore.c

Simple merge
Simple merge