Merge remote-tracking branch 'remotes/hwbp/pc_bluegene' into winbgq_merge
authorlegendre1 <legendre1@auk60.llnl.gov>
Fri, 27 Apr 2012 22:57:50 +0000 (15:57 -0700)
committerlegendre1 <legendre1@auk60.llnl.gov>
Fri, 27 Apr 2012 22:57:50 +0000 (15:57 -0700)
commit8bfe16c410ad83abec1c89aec5804d69fffcb94e
tree517dd654b4189a6a512b84be40fb4b1354b853ca
parent60cf3b514419531a8bdf8a2bb08c51c599efb52a
parent43fb089351780ef1851e58cda600c6c870331b62
Merge remote-tracking branch 'remotes/hwbp/pc_bluegene' into winbgq_merge

Conflicts:
proccontrol/h/PCErrors.h
proccontrol/src/int_process.h
proccontrol/src/process.C
testsuite/x86_64-unknown-linux2.4/make.mutators.gen
testsuite/x86_64-unknown-linux2.4/make.solo_mutatee.gen
testsuite/x86_64-unknown-linux2.4/tuples
65 files changed:
proccontrol/h/Event.h
proccontrol/h/PCErrors.h
proccontrol/h/Process.h
proccontrol/src/bluegenep.C
proccontrol/src/event.C
proccontrol/src/freebsd.C
proccontrol/src/handler.C
proccontrol/src/int_event.h
proccontrol/src/int_process.h
proccontrol/src/int_thread_db.C
proccontrol/src/int_thread_db.h
proccontrol/src/linux.C
proccontrol/src/linux.h
proccontrol/src/ppc_process.C
proccontrol/src/ppc_process.h
proccontrol/src/process.C
proccontrol/src/procset.C
proccontrol/src/x86_process.C
proccontrol/src/x86_process.h
testsuite/amd64-unknown-freebsd7.2/make.mutators.gen
testsuite/amd64-unknown-freebsd7.2/make.solo_mutatee.gen
testsuite/amd64-unknown-freebsd7.2/test_info_new.gen.C
testsuite/amd64-unknown-freebsd7.2/tuples
testsuite/i386-unknown-freebsd7.2/make.mutators.gen
testsuite/i386-unknown-freebsd7.2/make.solo_mutatee.gen
testsuite/i386-unknown-freebsd7.2/test_info_new.gen.C
testsuite/i386-unknown-freebsd7.2/tuples
testsuite/i386-unknown-linux2.4/make.mutators.gen
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/i386-unknown-nt4.0/nmake.solo_mutatee.gen
testsuite/i386-unknown-nt4.0/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/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_bgq_ion/make.mutators.gen
testsuite/ppc64_bgq_ion/make.solo_mutatee.gen
testsuite/ppc64_bgq_ion/test_info_new.gen.C
testsuite/ppc64_bgq_ion/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/rs6000-ibm-aix5.1/make.solo_mutatee.gen
testsuite/rs6000-ibm-aix5.1/tuples
testsuite/src/connection.C
testsuite/src/specification/spec-grouped.pl
testsuite/x86_64-unknown-linux2.4/make.mutators.gen
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