Merge branch 'replica_ft' of charmgit:charm into replica_ft
authorXiang Ni <xiangni@hopper09.(none)>
Sun, 30 Dec 2012 01:52:58 +0000 (17:52 -0800)
committerXiang Ni <xiangni@hopper09.(none)>
Sun, 30 Dec 2012 01:52:58 +0000 (17:52 -0800)
commitbfcd6f09011224e2480fc5f34664fc5c581006fc
tree612881124a653e3425481a5c196bb01a9b2111f7
parent1680b04675a57597b513ec1aabadabfc0911759f
parentcb15b6ba9e9d3d9012e64a766fe1c4b6ab94cdbf
Merge branch 'replica_ft' of charmgit:charm into replica_ft

Conflicts:
src/ck-core/ckmemcheckpoint.C
12 files changed:
src/arch/mpi/machine.c
src/ck-core/cklocation.C
src/ck-core/ckmemcheckpoint.C
src/ck-core/ckmemcheckpoint.ci
src/ck-core/ckmemcheckpoint.h
src/ck-core/init.C
src/conv-core/convcore.c
src/conv-core/threads.c
src/libs/ck-libs/ampi/ampi.C
src/libs/ck-libs/ampi/ampif.C
src/libs/ck-libs/tcharm/tcharm.C
src/util/uJcontext.c