Merge branch 'charm' into nocopy-sdag
authorJonathan Lifflander <jliffl2@illinois.edu>
Sat, 13 Jul 2013 00:24:26 +0000 (19:24 -0500)
committerJonathan Lifflander <jliffl2@illinois.edu>
Sat, 13 Jul 2013 00:24:26 +0000 (19:24 -0500)
commit27b0d1b3a20c8b06dc3c434db4b2fa8de1250249
tree70019bbc8c0f8df5d86dcfce0f8bb0b12cc662ae
parentbaefa147d61615e03d3d0e2ca42d463f162d7241
parent09dac1fddd4246f4803b4b29e519c2b02bd8cbc0
Merge branch 'charm' into nocopy-sdag

Conform sdag.C compilation to the Makefile changes.

Conflicts:
src/scripts/Makefile
src/ck-perf/trace-common.C
src/scripts/Makefile
src/util/pup.h
src/xlat-i/xi-symbol.C