Merge branch 'Defensive'
authorAndrew Bernat <bernat@cumin.cs.wisc.edu>
Tue, 23 Aug 2011 15:20:07 +0000 (10:20 -0500)
committerAndrew Bernat <bernat@cumin.cs.wisc.edu>
Tue, 23 Aug 2011 15:20:07 +0000 (10:20 -0500)
commite30d9d772a96c9e4b96f08a75d7a0014f905d7db
tree56985fb3969af10bbed6990e23771e983916d74d
parentee95eb18be9f7cf64b15f5176de98574cf28663e
parent46972b4ba0b33fd133b8e7528a8828948eece409
Merge branch 'Defensive'

Conflicts:
dyninstAPI/h/BPatch_addressSpace.h
dyninstAPI/src/BPatch_addressSpace.C
dyninstAPI/src/Relocation/CodeMover.C
dyninstAPI/src/addressSpace.C
dyninstAPI/src/addressSpace.h
dyninstAPI/src/function.C
parseAPI/src/ParserDetails.C
patchAPI/h/PatchCFG.h
patchAPI/h/PatchMgr.h
patchAPI/h/PatchObject.h
patchAPI/h/common.h
patchAPI/make.module.tmpl
symtabAPI/src/Symtab-edit.C
symtabAPI/src/Symtab-lookup.C
symtabAPI/src/Symtab.C
testsuite/amd64-unknown-freebsd7.2/tuples
testsuite/i386-unknown-freebsd7.2/tuples
testsuite/i386-unknown-linux2.4/tuples
testsuite/x86_64-unknown-linux2.4/tuples
32 files changed:
dyninstAPI/h/BPatch_addressSpace.h
dyninstAPI/h/BPatch_function.h
dyninstAPI/src/BPatch_addressSpace.C
dyninstAPI/src/Parsing.C
dyninstAPI/src/Relocation/CodeMover.C
dyninstAPI/src/Relocation/DynPointMaker.C
dyninstAPI/src/addressSpace.C
dyninstAPI/src/addressSpace.h
patchAPI/h/PatchCFG.h
patchAPI/h/PatchMgr.h
patchAPI/h/PatchObject.h
patchAPI/make.module.tmpl
patchAPI/patchAPI.vcproj
patchAPI/src/AddrSpace.C
patchAPI/src/PatchMgr.C
patchAPI/src/PointMaker.C
symtabAPI/h/Symtab.h
symtabAPI/src/Symtab-edit.C
symtabAPI/src/Symtab.C
testsuite/amd64-unknown-freebsd7.2/make.mutators.gen
testsuite/amd64-unknown-freebsd7.2/make.solo_mutatee.gen
testsuite/amd64-unknown-freebsd7.2/test_info_new.gen.C
testsuite/i386-unknown-freebsd7.2/make.mutators.gen
testsuite/i386-unknown-freebsd7.2/make.solo_mutatee.gen
testsuite/i386-unknown-freebsd7.2/test_info_new.gen.C
testsuite/i386-unknown-linux2.4/make.mutators.gen
testsuite/i386-unknown-linux2.4/make.solo_mutatee.gen
testsuite/i386-unknown-linux2.4/test_info_new.gen.C
testsuite/src/specification/spec-grouped.pl
testsuite/x86_64-unknown-linux2.4/make.mutators.gen
testsuite/x86_64-unknown-linux2.4/make.solo_mutatee.gen
testsuite/x86_64-unknown-linux2.4/test_info_new.gen.C