Merge branch 'dyn_pc_integration' of ssh://wasabi.cs.wisc.edu/p/paradyn/development...
authorDan McNulty <mcnulty@cs.wisc.edu>
Tue, 15 Mar 2011 19:50:50 +0000 (14:50 -0500)
committerDan McNulty <mcnulty@cs.wisc.edu>
Tue, 15 Mar 2011 19:50:50 +0000 (14:50 -0500)
commit0bf44df3b31d68eceeb1b3e025e1708f99991eca
tree39e6bdbeac7cec830506af445290cd85931234f8
parentc548877cef1a34b9997fd3316e48cff3e05d6f9d
parent5d6b81648bf8c9f8f178b260327a7559daf33ae4
Merge branch 'dyn_pc_integration' of ssh://wasabi.cs.wisc.edu/p/paradyn/development/mcnulty/d0/dyninst into dyn_pc_integration

Conflicts:
dyninstAPI/src/linux.C
proccontrol/src/freebsd.h
testsuite/src/proccontrol/pc_thread.C
19 files changed:
common/src/addrtranslate-sysv.C
dyninstAPI/src/linux-x86.C
dyninstAPI/src/linux.C
dyninstAPI/src/pcEventHandler.C
dyninstAPI/src/pcProcess.C
dyninstAPI/src/pcProcess.h
make.config
parseThat/Makefile.in
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/process.C
stackwalk/ppc64_linux/Makefile
stackwalk/src/dbginfo-stepper.C
stackwalk/src/x86-swk.C
testsuite/make.module.tmpl
testsuite/src/proccontrol/pc_thread.C