Merge remote-tracking branch 'remotes/origin/dyn_pc_integration' into winbgq_merge
authorlegendre1 <legendre1@auk60.llnl.gov>
Tue, 1 May 2012 18:48:44 +0000 (11:48 -0700)
committerlegendre1 <legendre1@auk60.llnl.gov>
Tue, 1 May 2012 18:48:44 +0000 (11:48 -0700)
commit6edcf768c20da0893b8f3c03f86083b76e19e2b8
treee990f1d499cb65f43606bd07fcbab608bd6c5068
parentc70d770b210df865d4b611e607e222fad1e15eca
parent77b9e5b1a9bb23538dbb6d80df5d0b7419bdaec1
Merge remote-tracking branch 'remotes/origin/dyn_pc_integration' into winbgq_merge

Conflicts:
proccontrol/h/Generator.h
proccontrol/h/Process.h
proccontrol/src/int_process.h
proccontrol/src/irpc.C
proccontrol/src/process.C
testsuite/src/proccontrol/pc_irpc.C
22 files changed:
dyninstAPI/src/pcEventHandler.C
dyninstAPI/src/pcEventHandler.h
proccontrol/h/Generator.h
proccontrol/h/Process.h
proccontrol/src/generator.C
proccontrol/src/handler.C
proccontrol/src/int_process.h
proccontrol/src/irpc.C
proccontrol/src/irpc.h
proccontrol/src/process.C
proccontrol/src/response.C
proccontrol/src/windows_process.C
proccontrol/src/windows_process.h
symtabAPI/src/Module.C
testsuite/src/MutateeStart.C
testsuite/src/dyninst/test_thread_7.C
testsuite/src/mutatee_driver.c
testsuite/src/proccontrol/pc_irpc.C
testsuite/src/proccontrol/pc_irpc_mutatee.c
testsuite/src/proccontrol/proccontrol_comp.C
testsuite/src/runTests.C
testsuite/src/test_driver.C