Merge remote branch 'remotes/desktop/dyninst_proccontrol' into dyninst_proccontrol
authorMatthew P. Legendre <legendre@rzmerl10.llnl.gov>
Sat, 5 May 2012 00:27:17 +0000 (17:27 -0700)
committerMatthew P. Legendre <legendre@rzmerl10.llnl.gov>
Sat, 5 May 2012 00:27:17 +0000 (17:27 -0700)
commitfec91815462cdf2f68d42528f66f68965e2bd850
tree1606b0abd089a91ca0b1634809397582120ebe3e
parent7f63ef04e9ac8b4006331180d3716f27113e9247
parent04d5667ec8e2e3bbebb3765d23df6a20ed252776
Merge remote branch 'remotes/desktop/dyninst_proccontrol' into dyninst_proccontrol

Conflicts:
testsuite/amd64-unknown-freebsd7.2/make.solo_mutatee.gen
testsuite/amd64-unknown-freebsd7.2/tuples
testsuite/i386-unknown-freebsd7.2/make.solo_mutatee.gen
testsuite/i386-unknown-freebsd7.2/tuples
testsuite/ppc32_bgp/make.solo_mutatee.gen
testsuite/ppc32_bgp/tuples
testsuite/ppc32_bgp_ion/make.solo_mutatee.gen
testsuite/ppc32_bgp_ion/tuples
testsuite/ppc32_linux/make.solo_mutatee.gen
testsuite/ppc32_linux/tuples
testsuite/ppc64_bgq_ion/make.solo_mutatee.gen
testsuite/ppc64_bgq_ion/tuples
testsuite/ppc64_linux/make.solo_mutatee.gen
testsuite/ppc64_linux/tuples
19 files changed:
testsuite/amd64-unknown-freebsd7.2/make.solo_mutatee.gen
testsuite/amd64-unknown-freebsd7.2/tuples
testsuite/i386-unknown-freebsd7.2/make.solo_mutatee.gen
testsuite/i386-unknown-freebsd7.2/tuples
testsuite/ppc32_bgp/make.solo_mutatee.gen
testsuite/ppc32_bgp/tuples
testsuite/ppc32_bgp_ion/make.solo_mutatee.gen
testsuite/ppc32_bgp_ion/tuples
testsuite/ppc32_linux/make.solo_mutatee.gen
testsuite/ppc32_linux/tuples
testsuite/ppc64_bgq_ion/Makefile
testsuite/ppc64_bgq_ion/make.solo_mutatee.gen
testsuite/ppc64_bgq_ion/tuples
testsuite/ppc64_linux/make.solo_mutatee.gen
testsuite/ppc64_linux/tuples
testsuite/src/dynlmon.C
testsuite/src/proccontrol/pc_groups_mutatee.c
testsuite/src/specification/spec-grouped.pl
testsuite/src/testdriver_be.C