Merge branch 'master' into patchapi_snippet
authorAndrew Bernat <bernat@cumin.cs.wisc.edu>
Wed, 22 Feb 2012 20:16:10 +0000 (14:16 -0600)
committerAndrew Bernat <bernat@cumin.cs.wisc.edu>
Wed, 22 Feb 2012 20:16:10 +0000 (14:16 -0600)
commitcadd2beb912480f63f20ba3391a434dbf8d52889
tree81dcabbe3eb0be27e769993e5b4709b014cb48fa
parenta6ca442c1752b85bc91979118e7f3ecfe398f63d
parent6693af2088d1e424bb1c8203f80dc0bfd65b1339
Merge branch 'master' into patchapi_snippet

Conflicts:
dyninstAPI/src/BPatch_snippet.C
dyninstAPI/src/Parsing.h
dyninstAPI/src/Relocation/CFG/RelocBlock.C
dyninstAPI/src/ast.C
dyninstAPI/src/instPoint.C
dyninstAPI/src/process.C
patchAPI/src/PatchObject.C
37 files changed:
dyninstAPI/h/BPatch_snippet.h
dyninstAPI/make.module.tmpl
dyninstAPI/src/BPatch_basicBlock.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/Transformers/Instrumenter.C
dyninstAPI/src/Relocation/Widgets/CFWidget-x86.C
dyninstAPI/src/Relocation/Widgets/CFWidget.C
dyninstAPI/src/Relocation/Widgets/InstWidget.C
dyninstAPI/src/addressSpace.C
dyninstAPI/src/ast.C
dyninstAPI/src/ast.h
dyninstAPI/src/binaryEdit.C
dyninstAPI/src/block.C
dyninstAPI/src/emit-x86.C
dyninstAPI/src/function.C
dyninstAPI/src/function.h
dyninstAPI/src/instPoint.C
dyninstAPI/src/instPoint.h
dyninstAPI/src/linux.C
dyninstAPI/src/mapped_object.C
dyninstAPI/src/process.C
instructionAPI/src/InstructionDecoder-x86.C
parseAPI/h/CFG.h
patchAPI/h/PatchCFG.h
patchAPI/src/PatchBlock.C
patchAPI/src/PatchMgr.C
patchAPI/src/PatchModifier.C
patchAPI/src/PatchObject.C
testsuite/src/patchapi/patch1_1.C
testsuite/src/patchapi/patch1_2.C
testsuite/src/patchapi/patch2_1.C
testsuite/src/patchapi/patch_modifier.C