Merge branch 'master' into Kevin-Drew
authorAndrew Bernat <bernat@brie.cs.wisc.edu>
Tue, 24 Aug 2010 18:07:14 +0000 (13:07 -0500)
committerAndrew Bernat <bernat@brie.cs.wisc.edu>
Tue, 24 Aug 2010 18:07:14 +0000 (13:07 -0500)
commitee6a4b7883cd3f2433f92d074b70c112c768ff55
treedc18442b8b22066d15854a59a6015251e4098c2c
parent6405e540c5291449c3ec1cafb8495006fe1731d5
parenta84ea7a981fb970ac40d3ed78bf65d4900a167e6
Merge branch 'master' into Kevin-Drew

Conflicts:
Makefile
common/common.vcproj
dyninstAPI/dyninstAPI.vcproj
dyninstAPI/src/Parsing.C
dyninstAPI_RT/DyninstAPI_RT.vcproj
instructionAPI/instructionAPI.vcproj
parseAPI/parseAPI.vcproj
symtabAPI/symtabAPI.vcproj
27 files changed:
Makefile
dataflowAPI/h/Absloc.h
dyninstAPI/make.module.tmpl
dyninstAPI/src/BPatch_asyncEventHandler.C
dyninstAPI/src/BPatch_point.C
dyninstAPI/src/addressSpace.C
dyninstAPI/src/binaryEdit.C
dyninstAPI/src/codegen.h
dyninstAPI/src/inst-x86.C
dyninstAPI/src/instPoint.C
dyninstAPI/src/linux-x86.C
dyninstAPI/src/linux.C
dyninstAPI/src/symtab.C
dyninstAPI/src/symtab.h
parseAPI/make.module.tmpl
parseAPI/src/Function.C
parseAPI/src/IA_IAPI.h
parseAPI/src/IA_power.C
parseAPI/src/IA_x86.C
symtabAPI/src/Object-elf.C
symtabAPI/src/Object-elf.h
symtabAPI/src/Symtab.C
symtabAPI/symtabAPI.vcproj
testsuite/make.module.tmpl
testsuite/src/specification/spec-grouped.pl
testsuite/src/specification/test.pl
testsuite/src/specification/tuples.py