Merge branch 'master' into origin/pc_bluegene
authorMatthew P. Legendre <legendre@zeus287.llnl.gov>
Tue, 23 Nov 2010 01:04:26 +0000 (17:04 -0800)
committerMatthew P. Legendre <legendre@zeus287.llnl.gov>
Tue, 23 Nov 2010 01:04:26 +0000 (17:04 -0800)
commit71eefad8262146b89934f784bc57ff21cf18adb2
tree5eac5f065cd046c0b764aef9c06049feefea6597
parent99edd534a2e33ccecc171eaf4a9a20784025c962
parent4336520d5889add0da2d7d3fed611a2c78f9b48c
Merge branch 'master' into origin/pc_bluegene

Conflicts:
testsuite/amd64-unknown-freebsd7.2/test_info_new.gen.C
testsuite/amd64-unknown-freebsd7.2/tuples
testsuite/i386-unknown-freebsd7.2/test_info_new.gen.C
testsuite/i386-unknown-freebsd7.2/tuples
testsuite/i386-unknown-linux2.4/test_info_new.gen.C
testsuite/i386-unknown-linux2.4/tuples
testsuite/ppc32_linux/test_info_new.gen.C
testsuite/ppc32_linux/tuples
testsuite/ppc64_linux/test_info_new.gen.C
testsuite/ppc64_linux/tuples
testsuite/src/test_driver.C
testsuite/x86_64-unknown-linux2.4/test_info_new.gen.C
testsuite/x86_64-unknown-linux2.4/tuples
25 files changed:
make.config
proccontrol/src/process.C
testsuite/amd64-unknown-freebsd7.2/test_info_new.gen.C
testsuite/amd64-unknown-freebsd7.2/tuples
testsuite/i386-unknown-freebsd7.2/test_info_new.gen.C
testsuite/i386-unknown-freebsd7.2/tuples
testsuite/i386-unknown-linux2.4/test_info_new.gen.C
testsuite/i386-unknown-linux2.4/tuples
testsuite/ppc32_bgp_ion/make.mutators.gen
testsuite/ppc32_bgp_ion/make.solo_mutatee.gen
testsuite/ppc32_bgp_ion/test_info_new.gen.C
testsuite/ppc32_linux/test_info_new.gen.C
testsuite/ppc32_linux/tuples
testsuite/ppc64_linux/test_info_new.gen.C
testsuite/ppc64_linux/tuples
testsuite/src/DatabaseOutputDriver.C
testsuite/src/TestOutputDriver.h
testsuite/src/dyninst/test4_2_mutatee.c
testsuite/src/dyninst/test_fork_5.C
testsuite/src/specification/spec-grouped.pl
testsuite/src/test_driver.C
testsuite/x86_64-unknown-linux2.4/test_info_new.gen.C
testsuite/x86_64-unknown-linux2.4/tuples
testsuite/x86_64_cnl/test_info_new.gen.C
testsuite/x86_64_cnl/tuples