Merge branch 'master' into NewInstpoint
authorAndrew Bernat <bernat@cumin.cs.wisc.edu>
Wed, 13 Apr 2011 21:55:18 +0000 (16:55 -0500)
committerAndrew Bernat <bernat@cumin.cs.wisc.edu>
Wed, 13 Apr 2011 21:55:18 +0000 (16:55 -0500)
commit1f65faed91bb8ca4802138f8c591c329cb6f83df
tree7294f1d8fa05b535d410c27cdcc82fdd11df8cb9
parent5735a21d730509b6af1c7ab88e022e55bdec3ae1
parentb8d78e4f63a834cc2547eda0ae9be80797c8e6f8
Merge branch 'master' into NewInstpoint

Conflicts:
parseAPI/src/Parser.C
14 files changed:
Makefile
dyninstAPI/src/binaryEdit.C
parseAPI/h/InstructionAdapter.h
parseAPI/src/IA_IAPI.C
parseAPI/src/IA_IAPI.h
parseAPI/src/IA_power.C
parseAPI/src/IA_x86.C
parseAPI/src/InstructionAdapter.C
parseAPI/src/Parser.C
parseThat/src/dyninstCore.C
symtabAPI/src/Symtab-lookup.C
testsuite/make.module.tmpl
testsuite/nmake.module.tmpl
testsuite/src/specification/spec-grouped.pl