Merge branch 'Defensive' of ssh://git.dyninst.org/pub/dyninst into Defensive
authorKevin Roundy <roundy@cs.wisc.edu>
Mon, 14 Feb 2011 17:52:43 +0000 (11:52 -0600)
committerKevin Roundy <roundy@cs.wisc.edu>
Mon, 14 Feb 2011 17:52:43 +0000 (11:52 -0600)
commitd4ef07661d778df5cadad18c374af94ff2f4152f
treeaa1f365b91eb1427c1bfaf29e04c3f8ea08f58e0
parent3173bd78e7d2940a051042b8552f8c1d72e23fbf
parent88c6fa4edc8ad602c6c49d86ae32304d3a894644
Merge branch 'Defensive' of ssh://git.dyninst.org/pub/dyninst into Defensive

Conflicts:
dyninstAPI/src/hybridCallbacks.C
dyninstAPI/src/hybridInstrumentation.C
dyninstAPI/h/BPatch_addressSpace.h
dyninstAPI/make.module.tmpl
dyninstAPI/src/MemoryEmulator/memEmulator.C
dyninstAPI/src/callbacks.C
dyninstAPI/src/callbacks.h
dyninstAPI/src/emit-x86.C
dyninstAPI/src/hybridCallbacks.C
dyninstAPI/src/mapped_object.C
dyninstAPI/src/process.h