Merge branch 'charm' of charmgit:charm into harshitha/adaptive_lb
authorHarshitha <gplkrsh2@illinois.edu>
Fri, 12 Oct 2012 05:16:19 +0000 (00:16 -0500)
committerHarshitha <gplkrsh2@illinois.edu>
Fri, 12 Oct 2012 05:16:19 +0000 (00:16 -0500)
commit922b7b3f5a89210082481c14edc834442b8f6821
tree392870c180a90c395f10f0c28f4b109285b09717
parent59382c3bfd95ff97fd3326a0828ab0b2b05c0184
parent09d5ac9d05abc8c488f9082fc02e67a6f8816057
Merge branch 'charm' of charmgit:charm into harshitha/adaptive_lb

Conflicts:
examples/charm++/jacobi1d/jacobi1d.C
src/ck-core/cklocation.C
src/ck-ldb/CommAwareRefineLB.C
src/scripts/Makefile
13 files changed:
src/ck-core/ckarray.C
src/ck-core/cklocation.C
src/ck-core/cklocation.h
src/ck-core/init.C
src/ck-ldb/BaseLB.h
src/ck-ldb/CentralLB.C
src/ck-ldb/CentralLB.h
src/ck-ldb/CommAwareRefineLB.C
src/ck-ldb/LBDatabase.C
src/ck-ldb/LBDatabase.h
src/ck-ldb/lbdb.C
src/ck-ldb/lbdb.h
src/scripts/Makefile