Merge branch 'master' of ssh://git.dyninst.org/pub/dyninst into Defensive
authorKevin Roundy <roundy@cs.wisc.edu>
Wed, 22 Jun 2011 15:04:06 +0000 (10:04 -0500)
committerKevin Roundy <roundy@cs.wisc.edu>
Wed, 22 Jun 2011 15:04:06 +0000 (10:04 -0500)
commitf57197d99fc9ce500953a80153fa45afd7b02394
tree22ca84c25fd17cede411f6b9500121713ce632d7
parent4473ab050330031b34ce1e6629eb4d40f69b32b1
parentbb7328b27239073cd4500eb129e086174dc348bc
Merge branch 'master' of ssh://git.dyninst.org/pub/dyninst into Defensive

Conflicts:
common/common.vcproj
dyninstAPI/dyninstAPI.vcproj
dyninstAPI/src/BPatch_addressSpace.C
dyninstAPI/src/BPatch_point.C
dyninstAPI/src/BPatch_process.C
dyninstAPI/src/Parsing.C
dyninstAPI/src/Parsing.h
dyninstAPI/src/Relocation/Transformers/Movement-analysis.C
dyninstAPI/src/binaryEdit.C
dyninstAPI/src/block.C
dyninstAPI/src/block.h
dyninstAPI/src/edge.C
dyninstAPI/src/function.C
dyninstAPI/src/function.h
dyninstAPI/src/mapped_object.C
dyninstAPI/src/symtab.h
parseAPI/h/CFG.h
parseAPI/h/CodeObject.h
parseAPI/parseAPI.vcproj
parseAPI/src/CodeObject.C
parseAPI/src/Parser.C
parseAPI/src/ParserDetails.C
symtabAPI/h/Region.h
45 files changed:
dataflowAPI/rose/semanticsModule.h
dyninstAPI/dyninstAPI.vcproj
dyninstAPI/h/BPatch_addressSpace.h
dyninstAPI/h/BPatch_process.h
dyninstAPI/src/BPatch_addressSpace.C
dyninstAPI/src/BPatch_binaryEdit.C
dyninstAPI/src/BPatch_function.C
dyninstAPI/src/BPatch_point.C
dyninstAPI/src/BPatch_process.C
dyninstAPI/src/Parsing.C
dyninstAPI/src/Parsing.h
dyninstAPI/src/Relocation/Transformers/Movement-analysis.C
dyninstAPI/src/Relocation/Transformers/Movement-analysis.h
dyninstAPI/src/Relocation/Widgets/Widget.h
dyninstAPI/src/addressSpace.C
dyninstAPI/src/addressSpace.h
dyninstAPI/src/baseTramp.C
dyninstAPI/src/binaryEdit.C
dyninstAPI/src/block.C
dyninstAPI/src/block.h
dyninstAPI/src/function.C
dyninstAPI/src/function.h
dyninstAPI/src/hybridOverwrites.C
dyninstAPI/src/instPoint.C
dyninstAPI/src/linux-x86.C
dyninstAPI/src/mapped_object.C
dyninstAPI/src/mapped_object.h
dyninstAPI/src/os.h
dyninstAPI/src/parse-cfg.C
dyninstAPI/src/parse-cfg.h
dyninstAPI/src/pdwinnt.C
dyninstAPI/src/process.C
dyninstAPI/src/process.h
dyninstAPI/src/registerSpace.C
dyninstAPI/src/symtab.C
dyninstAPI/src/symtab.h
dyninstAPI/src/unix.C
dyninstAPI_RT/src/RTcommon.c
parseAPI/src/IA_IAPI.C
parseAPI/src/Parser.C
parseAPI/src/Parser.h
parseAPI/src/ParserDetails.C
symtabAPI/h/Symtab.h
symtabAPI/src/Symtab-edit.C
symtabAPI/src/Symtab.C