Merge branch 'charm' of charmgit:charm into xiang/optChkp
authorXiang Ni <xiangni2@illinois.edu>
Wed, 24 Oct 2012 17:18:26 +0000 (12:18 -0500)
committerXiang Ni <xiangni2@illinois.edu>
Wed, 24 Oct 2012 17:18:26 +0000 (12:18 -0500)
commite95c4ea1388dc5831efc684881f1f6ea5552970f
treee72e1422ed55b797f0b9ce1bafcab404c772465c
parent4e46e859604268f2bb04ace97b913ddf780da865
parent866d99b1c7a3179c7ada1ba5b850290bed4fe0fe
Merge branch 'charm' of charmgit:charm into xiang/optChkp

Conflicts:
src/ck-core/cklocation.C
src/ck-ldb/GreedyLB.C
src/conv-core/convcore.c
src/ck-core/ckcheckpoint.C
src/ck-core/cklocation.C
src/ck-core/cklocation.h
src/ck-core/ckmemcheckpoint.C
src/ck-ldb/CentralLB.C
src/ck-ldb/HybridBaseLB.C
src/conv-core/convcore.c