Merge branch 'master' into devel
authorTodd Frederick <taf@cs.wisc.edu>
Mon, 14 Jun 2010 21:09:39 +0000 (16:09 -0500)
committerTodd Frederick <taf@cs.wisc.edu>
Mon, 14 Jun 2010 21:09:39 +0000 (16:09 -0500)
commit6a70e88c73e928a7dc10a288b1902bb364f2d40b
tree65157a811db08cbdf627026bf63403dd0519f90b
parent7b40e4c556c7d3ac0f032192bdfe9f3fbbbad9ab
parent62b7d1f21d75bb81255914b53cc1ab99ca9da21e
Merge branch 'master' into devel

Conflicts:
dyninstAPI/src/codegen-x86.C
instructionAPI/h/entryIDs.h
common/src/arch-x86.C
dyninstAPI/src/symtab.h
instructionAPI/h/Operation.h
instructionAPI/h/entryIDs.h
instructionAPI/src/InstructionDecoder-x86.C
instructionAPI/src/Operation.C
proccontrol/src/process.C
symEval/h/SymEval.h
symEval/make.module.tmpl
symEval/src/SymEval.C