Merge c:/dyninst/pc_bluegene/dyninst into dyn_pc_integration
authorunknown <User@.(none)>
Mon, 21 Nov 2011 22:32:47 +0000 (16:32 -0600)
committerunknown <User@.(none)>
Mon, 21 Nov 2011 22:32:47 +0000 (16:32 -0600)
commit008f91da724a085ee2851f55c6956c6dc0e9f589
tree67ffc33f4c48b2f2143cfc35c98519c33d8c8801
parentb7eb330c2b5df98be9c64f4e80a11d53607d51a5
parente15976ab91c5a7ad9c257f6d2436d94210a1f354
Merge c:/dyninst/pc_bluegene/dyninst into dyn_pc_integration

Conflicts:
proccontrol/h/Event.h
proccontrol/h/Mailbox.h
proccontrol/h/PCErrors.h
proccontrol/h/Process.h
proccontrol/src/event.C
proccontrol/src/generator.C
proccontrol/src/handler.C
proccontrol/src/int_process.h
proccontrol/src/irpc.C
proccontrol/src/irpc.h
proccontrol/src/mailbox.C
proccontrol/src/process.C
proccontrol/src/response.C
proccontrol/src/x86_process.C
testsuite/i386-unknown-nt4.0/tuples
testsuite/src/CmdLine.h
testsuite/src/mutatee_driver.c
testsuite/src/proccontrol/pc_library.C
testsuite/src/proccontrol/pc_singlestep.C
testsuite/src/proccontrol/pc_thread.C
testsuite/src/proccontrol/pc_thread_cont_mutatee.c
testsuite/src/proccontrol/pcontrol_mutatee_tools.c
testsuite/src/proccontrol/proccontrol_comp.C
testsuite/src/specification/spec-grouped.pl
testsuite/src/test_info_new.C
60 files changed:
DyninstAPI.sln
autodyninst/default_component
dyninstAPI/src/pcEventHandler.C
dynutil/h/dyn_regs.h
dynutil/h/dyntypes.h
proccontrol/h/Event.h
proccontrol/h/EventType.h
proccontrol/h/Generator.h
proccontrol/h/Handler.h
proccontrol/h/Mailbox.h
proccontrol/h/PCErrors.h
proccontrol/h/Process.h
proccontrol/src/DecoderWindows.C
proccontrol/src/DecoderWindows.h
proccontrol/src/GeneratorWindows.C
proccontrol/src/event.C
proccontrol/src/generator.C
proccontrol/src/handler.C
proccontrol/src/int_handler.h
proccontrol/src/int_process.h
proccontrol/src/irpc.C
proccontrol/src/irpc.h
proccontrol/src/pcerrors.C
proccontrol/src/process.C
proccontrol/src/windows_handler.C
proccontrol/src/windows_handler.h
proccontrol/src/windows_process.C
proccontrol/src/windows_process.h
proccontrol/src/windows_thread.C
proccontrol/src/windows_thread.h
proccontrol/src/x86_process.C
proccontrol/src/x86_process.h
testsuite/i386-unknown-nt4.0/test_info_new.gen.C
testsuite/i386-unknown-nt4.0/tuples
testsuite/nmake.module.tmpl
testsuite/src/DatabaseOutputDriver.C
testsuite/src/MutateeStart.C
testsuite/src/dyninst/test_thread_6.C
testsuite/src/dyninst/test_thread_8.C
testsuite/src/mutatee_driver.c
testsuite/src/mutatee_util.h
testsuite/src/proccontrol/communication.h
testsuite/src/proccontrol/pc_breakpoint.C
testsuite/src/proccontrol/pc_breakpoint_mutatee.c
testsuite/src/proccontrol/pc_detach_mutatee.c
testsuite/src/proccontrol/pc_irpc.C
testsuite/src/proccontrol/pc_library.C
testsuite/src/proccontrol/pc_singlestep.C
testsuite/src/proccontrol/pc_terminate_common.C
testsuite/src/proccontrol/pc_thread.C
testsuite/src/proccontrol/pc_thread_cont.C
testsuite/src/proccontrol/pc_thread_cont_mutatee.c
testsuite/src/proccontrol/pc_thread_mutatee.c
testsuite/src/proccontrol/pcontrol_mutatee_tools.c
testsuite/src/proccontrol/pcontrol_mutatee_tools.h
testsuite/src/proccontrol/proccontrol_comp.C
testsuite/src/proccontrol/proccontrol_comp.h
testsuite/src/specification/spec-grouped.pl
testsuite/src/test_info_new.h
testsuite/src/test_lib_dllExecution.C