Merge remote branch 'remotes/origin/dyn_pc_integration' into origin/pc_bluegene
authorMatthew P. Legendre <legendre@atlas0.llnl.gov>
Thu, 2 Jun 2011 17:29:48 +0000 (10:29 -0700)
committerMatthew P. Legendre <legendre@atlas0.llnl.gov>
Thu, 2 Jun 2011 17:29:48 +0000 (10:29 -0700)
commitf5e3492a816f02929bbebc0a7d2063fe41dd7b3e
tree0b7fe6e88bbd26efc37dd73d189c05bb5ed892cd
parent00ffc8f9ee9e8900533a173eb644f297a9e57a31
parent13f6964e33e8cc0a538e39e738ef2a9c9e536e81
Merge remote branch 'remotes/origin/dyn_pc_integration' into origin/pc_bluegene

Conflicts:
proccontrol/src/handler.C
proccontrol/src/int_thread_db.C
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_linux/make.mutators.gen
testsuite/ppc32_linux/make.solo_mutatee.gen
testsuite/ppc32_linux/test_info_new.gen.C
testsuite/ppc32_linux/tuples
testsuite/ppc64_linux/make.mutators.gen
testsuite/ppc64_linux/make.solo_mutatee.gen
testsuite/ppc64_linux/test_info_new.gen.C
testsuite/ppc64_linux/tuples
testsuite/x86_64-unknown-linux2.4/test_info_new.gen.C
testsuite/x86_64-unknown-linux2.4/tuples
38 files changed:
proccontrol/h/PCErrors.h
proccontrol/h/Process.h
proccontrol/src/freebsd.C
proccontrol/src/freebsd.h
proccontrol/src/handler.C
proccontrol/src/int_process.h
proccontrol/src/int_thread_db.C
proccontrol/src/int_thread_db.h
proccontrol/src/linux.C
proccontrol/src/process.C
testsuite/amd64-unknown-freebsd7.2/symtab_group_test_group.c
testsuite/amd64-unknown-freebsd7.2/test_info_new.gen.C
testsuite/amd64-unknown-freebsd7.2/tuples
testsuite/i386-unknown-freebsd7.2/symtab_group_test_group.c
testsuite/i386-unknown-freebsd7.2/test_info_new.gen.C
testsuite/i386-unknown-freebsd7.2/tuples
testsuite/i386-unknown-linux2.4/make.solo_mutatee.gen
testsuite/i386-unknown-linux2.4/test_info_new.gen.C
testsuite/i386-unknown-linux2.4/tuples
testsuite/ppc32_bgp/make.mutators.gen
testsuite/ppc32_bgp/make.solo_mutatee.gen
testsuite/ppc32_bgp/test_info_new.gen.C
testsuite/ppc32_bgp/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_bgp_ion/tuples
testsuite/src/dyninst/test4_2_mutatee.c
testsuite/src/mutatee_util.c
testsuite/src/mutatee_util.h
testsuite/src/specification/spec-grouped.pl
testsuite/x86_64-unknown-linux2.4/make.solo_mutatee.gen
testsuite/x86_64-unknown-linux2.4/test_info_new.gen.C
testsuite/x86_64-unknown-linux2.4/tuples
testsuite/x86_64_cnl/make.mutators.gen
testsuite/x86_64_cnl/make.solo_mutatee.gen
testsuite/x86_64_cnl/test_info_new.gen.C
testsuite/x86_64_cnl/tuples