Merge branch 'master' into pcint
authorDaniel McNulty <mcnulty@cs.wisc.edu>
Thu, 6 Jan 2011 19:05:11 +0000 (13:05 -0600)
committerDaniel McNulty <mcnulty@cs.wisc.edu>
Thu, 6 Jan 2011 19:05:11 +0000 (13:05 -0600)
commite3ac5b4eb6d265184c785c88ebdbcac635e0f7a7
treec51c24e1aad484b26182df21fe9082acb54b91d8
parent443f81d3da8c6b9dd4a7c674ab27090208ca2b9c
parent82d93e68b120dc761a52843bd45649b9fcfe09d8
Merge branch 'master' into pcint

Conflicts:
common/src/addrtranslate-sysv.h
dyninstAPI/src/BPatch.C
dyninstAPI/src/aix.C
dyninstAPI/src/emit-x86.C
dyninstAPI/src/instPoint.C
dyninstAPI/src/linux-x86.C
dyninstAPI/src/linux.C
dyninstAPI/src/process.C
dyninstAPI/src/signalhandler.C
dyninstAPI/src/solaris.C
proccontrol/src/process.C
stackwalk/h/procstate.h
stackwalk/src/catamount-swk.C
stackwalk/src/linux-swk.h
stackwalk/src/procstate.C
55 files changed:
Makefile
common/h/addrtranslate.h
common/src/addrtranslate-sysv.C
common/src/addrtranslate-sysv.h
common/src/addrtranslate.C
dataflowAPI/h/Absloc.h
dynC_API/make.module.tmpl
dyninstAPI/h/BPatch.h
dyninstAPI/h/BPatch_function.h
dyninstAPI/h/BPatch_image.h
dyninstAPI/h/BPatch_module.h
dyninstAPI/h/BPatch_point.h
dyninstAPI/h/BPatch_snippet.h
dyninstAPI/h/BPatch_type.h
dyninstAPI/make.module.tmpl
dyninstAPI/src/BPatch.C
dyninstAPI/src/BPatch_addressSpace.C
dyninstAPI/src/BPatch_function.C
dyninstAPI/src/BPatch_image.C
dyninstAPI/src/BPatch_module.C
dyninstAPI/src/BPatch_point.C
dyninstAPI/src/BPatch_snippet.C
dyninstAPI/src/aix.C
dyninstAPI/src/ast.C
dyninstAPI/src/ast.h
dyninstAPI/src/baseTramp.C
dyninstAPI/src/baseTramp.h
dyninstAPI/src/codeRange.C
dyninstAPI/src/emit-x86.C
dyninstAPI/src/freebsd.C
dyninstAPI/src/function.C
dyninstAPI/src/inst-power.C
dyninstAPI/src/inst-x86.C
dyninstAPI/src/instPoint.C
dyninstAPI/src/linux-x86.C
dyninstAPI/src/mapped_object.C
dyninstAPI/src/multiTramp.C
dyninstAPI/src/pdwinnt.C
dyninstAPI/src/registerSpace.C
dyninstAPI/src/registerSpace.h
dyninstAPI/src/reloc-func.C
dyninstAPI/src/solaris.C
dyninstAPI/src/stackwalk-x86.C
instructionAPI/h/entryIDs.h
proccontrol/h/Process.h
proccontrol/make.module.tmpl
proccontrol/src/process.C
stackwalk/h/procstate.h
stackwalk/make.module.tmpl
stackwalk/src/aix-swk.C
stackwalk/src/bluegene-swk.C
stackwalk/src/libstate.C
stackwalk/src/libstate.h
stackwalk/src/linux-swk.C
stackwalk/src/procstate.C