Attempt to merge with charm manually
authorNikhil Jain <nikhil@illinois.edu>
Wed, 12 Oct 2011 04:54:09 +0000 (23:54 -0500)
committerNikhil Jain <nikhil@illinois.edu>
Wed, 12 Oct 2011 04:54:09 +0000 (23:54 -0500)
commit0d6106f81d9cf20211bf0a720eff51bdd77f33da
tree69d6d8ab7c4353303a45dd03e9134de7a958ab12
parentb966f0a74a56dd6658f460f8d72a5883aa5787a7
Attempt to merge with charm manually
16 files changed:
src/arch/gemini_gni-crayxe/conv-mach.h
src/arch/util/mempool.c
src/arch/util/mempool.h
src/conv-core/cpuaffinity.c
src/conv-core/cputopology.C
src/libs/ck-libs/TMRC2D/tri.h
src/libs/ck-libs/TMRC2D/vector2d.h [deleted file]
src/libs/ck-libs/ampi/ampi.C
src/libs/ck-libs/fem/Makefile
src/libs/ck-libs/fem/vector2d.h [deleted file]
src/libs/ck-libs/tmr/tri.h
src/libs/ck-libs/tmr/vector2d.h [deleted file]
src/scripts/Makefile
src/util/CrayNid.c
src/util/TopoManager.h
src/util/XTTorus.h