Merge branch 'master' into patchapi_snippet
authorAndrew Bernat <bernat@cumin.cs.wisc.edu>
Fri, 13 Jan 2012 16:48:33 +0000 (10:48 -0600)
committerAndrew Bernat <bernat@cumin.cs.wisc.edu>
Fri, 13 Jan 2012 16:48:33 +0000 (10:48 -0600)
commit29b830595a72f099b79803e7dfd8f40445638d31
tree7136b9e8c34569f4a312d3119853b5f1565bd42c
parent02ccb03e10acc1f2641f13732abc93b8ad268610
parent0434a2e23c9ed9ddd9394f72eea00bcce8296371
Merge branch 'master' into patchapi_snippet

Conflicts:
dyninstAPI/src/BPatch_point.C
dyninstAPI/src/BPatch_process.C
dyninstAPI/src/Relocation/CodeMover.C
dyninstAPI/src/Relocation/DynAddrSpace.C
dyninstAPI/src/Relocation/Widgets/CFWidget-x86.C
dyninstAPI/src/ast.C
dyninstAPI/src/block.C
dyninstAPI/src/function.C
dyninstAPI/src/mapped_object.C
parseAPI/src/ParserDetails.C
patchAPI/h/PatchCFG.h
patchAPI/make.module.tmpl
patchAPI/src/PatchBlock.C
patchAPI/src/PatchModifier.C
36 files changed:
dyninstAPI/h/BPatch_addressSpace.h
dyninstAPI/h/BPatch_module.h
dyninstAPI/h/BPatch_snippet.h
dyninstAPI/src/BPatch_addressSpace.C
dyninstAPI/src/BPatch_basicBlock.C
dyninstAPI/src/BPatch_module.C
dyninstAPI/src/BPatch_point.C
dyninstAPI/src/BPatch_process.C
dyninstAPI/src/BPatch_snippet.C
dyninstAPI/src/Relocation/CFG/RelocBlock.C
dyninstAPI/src/Relocation/CodeMover.C
dyninstAPI/src/Relocation/Springboard.C
dyninstAPI/src/Relocation/Widgets/CFWidget-x86.C
dyninstAPI/src/addressSpace.C
dyninstAPI/src/addressSpace.h
dyninstAPI/src/ast.C
dyninstAPI/src/ast.h
dyninstAPI/src/binaryEdit.C
dyninstAPI/src/block.C
dyninstAPI/src/block.h
dyninstAPI/src/emit-x86.C
dyninstAPI/src/function.C
dyninstAPI/src/function.h
dyninstAPI/src/inst-power.C
dyninstAPI/src/mapped_object.C
dyninstAPI/src/process.C
parseAPI/h/CFG.h
parseAPI/h/CFGModifier.h
parseAPI/src/Block.C
parseAPI/src/CFGModifier.C
patchAPI/h/PatchCFG.h
patchAPI/h/PatchModifier.h
patchAPI/src/PatchBlock.C
patchAPI/src/PatchModifier.C
patchAPI/src/PatchObject.C
stackwalk/src/linux-swk.C