Merge branch 'master' of ssh://bill@git.dyninst.org/pub/dyninst
authorBill Williams <bill@cs.wisc.edu>
Tue, 6 Apr 2010 16:42:20 +0000 (11:42 -0500)
committerBill Williams <bill@cs.wisc.edu>
Tue, 6 Apr 2010 16:42:20 +0000 (11:42 -0500)
commit711d0b46cd0f6eb990471ed19570c6b4f796b45b
tree9c8740109b2a43c3b6f6001f72b6ca38a80cb519
parente7770299062cb411e52039c6666c0c0fc7d18f3f
parent39a185f8b765fd1eadb36f1c148ae73bf0cedcb3
Merge branch 'master' of ssh://bill@git.dyninst.org/pub/dyninst

Conflicts:
dyninstAPI/src/RegisterConversion-x86.C
dyninstAPI/src/stackanalysis.C
dyninstAPI/src/symtab.C
make.config
symEval/h/SymEval.h
symEval/src/SymEval.C
symEval/src/SymEvalPolicy.C
symEval/src/SymEvalPolicy.h
16 files changed:
common/src/dyn_regs.C
dyninstAPI/src/RegisterConversion-x86.C
dyninstAPI/src/arch-power.C
dyninstAPI/src/arch-power.h
dyninstAPI/src/inst-power.C
dyninstAPI/src/stackanalysis.C
dynutil/h/dyn_regs.h
instructionAPI/h/Instruction.h
instructionAPI/src/InstructionDecoder-x86.C
make.config
symEval/h/SymEval.h
symEval/src/SymEval.C
symEval/src/SymEvalPolicy.C
symEval/src/SymEvalPolicy.h
symtabAPI/src/Object-elf.C
testsuite/make.module.tmpl