Merge branch 'master' into NewInstpoint
authorAndrew Bernat <bernat@cumin.cs.wisc.edu>
Fri, 29 Apr 2011 21:13:22 +0000 (16:13 -0500)
committerAndrew Bernat <bernat@cumin.cs.wisc.edu>
Fri, 29 Apr 2011 21:13:22 +0000 (16:13 -0500)
commitcdedaa7093692255051204ccd1118ea5823f921f
tree9b83ba56c8f00345816021ff2f568b93e0c2fc71
parent7b5e5fef821dcaf4a167d5124e7d1d10c19d2b5f
parentd5a91fe8ba4f12884625f5160bcf52b9d497fdc6
Merge branch 'master' into NewInstpoint

Conflicts:
parseAPI/src/ParserDetails.C
dynutil/h/dyn_regs.h
instructionAPI/src/InstructionDecoder-x86.C
parseAPI/src/ParserDetails.C
testsuite/src/specification/spec-grouped.pl