Merge branch 'Defensive' of ssh://coriander.cs.wisc.edu/u/r/o/roundy/devel/g0/dyninst...
authorKevin Roundy <roundy@cs.wisc.edu>
Thu, 30 Jun 2011 17:14:26 +0000 (12:14 -0500)
committerKevin Roundy <roundy@cs.wisc.edu>
Thu, 30 Jun 2011 17:14:26 +0000 (12:14 -0500)
commit92fdb195832784cb4253ff066bb2290841dc8b4b
tree0602df540897202bbf2ebf58b92bc79097a9ffae
parent918945edb17d5cf8b7de11b0c784a4af9a5fe5d3
parente1e0d50f5023ab9755667f8ff3f24321a510cbd1
Merge branch 'Defensive' of ssh://coriander.cs.wisc.edu/u/r/o/roundy/devel/g0/dyninst into Defensive

Fixes Windows compile errors, Windows project file.

Conflicts:
dyninstAPI/src/Parsing.C
13 files changed:
dyninstAPI/src/BPatch_addressSpace.C
dyninstAPI/src/BPatch_process.C
dyninstAPI/src/block.h
dyninstAPI/src/function.C
dyninstAPI/src/function.h
dyninstAPI/src/hybridCallbacks.C
dyninstAPI/src/mapped_object.C
parseAPI/parseAPI.vcproj
patchAPI/h/PatchCFG.h
patchAPI/h/PatchMgr.h
patchAPI/h/PatchObject.h
patchAPI/src/PatchObject.C
patchAPI/src/PointMaker.C