Additional merge fixes
authorAndrew Bernat <bernat@follis.cs.wisc.edu>
Tue, 26 Jun 2012 17:38:07 +0000 (12:38 -0500)
committerAndrew Bernat <bernat@follis.cs.wisc.edu>
Tue, 26 Jun 2012 17:38:07 +0000 (12:38 -0500)
commitd0ab63a90023995b044ef6588d37755f7ed28037
treeecf8701eb7445400400bc0f94b70bf2895a4d114
parent2c9fdfe63be7fd2ff230e5a4cff912334d9cb683
Additional merge fixes
34 files changed:
dyninstAPI/h/BPatch_module.h
dyninstAPI/h/BPatch_snippet.h
dyninstAPI/make.module.tmpl
dyninstAPI/src/BPatch_binaryEdit.C
dyninstAPI/src/BPatch_parRegion.C
dyninstAPI/src/BPatch_point.C
dyninstAPI/src/BPatch_process.C
dyninstAPI/src/Relocation/Transformers/Movement-adhoc.C
dyninstAPI/src/addressSpace.C
dyninstAPI/src/aix.C
dyninstAPI/src/aixDL.C
dyninstAPI/src/ast.h
dyninstAPI/src/codeRange.C
dyninstAPI/src/dynProcess.C
dyninstAPI/src/frame.C
dyninstAPI/src/inst-power.C
dyninstAPI/src/inst-x86.C
dyninstAPI/src/inst.C
dyninstAPI/src/inst.h
dyninstAPI/src/instP.h
dyninstAPI/src/instPoint.C
dyninstAPI/src/linux-power.C
dyninstAPI/src/linux-x86.C
dyninstAPI/src/parse-power.C
dyninstAPI/src/parse-x86.C
dyninstAPI/src/syscall-solproc.C
dyninstAPI/src/syscall-vxworks.C
dyninstAPI/src/syscallNotification.C
dyninstAPI/src/vxworks.C
patchAPI/h/PatchCommon.h
patchAPI/h/PatchMgr.h
patchAPI/h/PatchModifier.h
patchAPI/h/Point.h
symtabAPI/src/emitElf.C