Merge branch 'master' into bsd
authorDaniel McNulty <mcnulty@cs.wisc.edu>
Thu, 1 Apr 2010 21:17:46 +0000 (16:17 -0500)
committerDaniel McNulty <mcnulty@cs.wisc.edu>
Thu, 1 Apr 2010 21:17:46 +0000 (16:17 -0500)
commit4a85c0b1196bae3738d667c3fdefec72e5308709
tree7ca40039de6e06016941628b5e685c4d6e06801f
parent8c288e6867757103948476483120ba7ace5572f5
parent2dab2cbc076733124ee443fa18315926f730bfd3
Merge branch 'master' into bsd

Conflicts:
make.config
testsuite/i386-unknown-linux2.4/tuples
testsuite/i386-unknown-nt4.0/tuples
testsuite/ia64-unknown-linux2.4/tuples
testsuite/ppc32_linux/tuples
testsuite/ppc64_linux/tuples
testsuite/rs6000-ibm-aix5.1/tuples
testsuite/sparc-sun-solaris2.8/tuples
testsuite/sparc-sun-solaris2.9/tuples
testsuite/src/specification/spec-grouped.pl
testsuite/x86_64-unknown-linux2.4/tuples
22 files changed:
dyninstAPI/src/binaryEdit.C
dyninstAPI/src/symtab.C
make.config
symtabAPI/src/Object-elf.C
symtabAPI/src/Object-elf.h
symtabAPI/src/Object.h
symtabAPI/src/Symtab.C
symtabAPI/src/emitElf.C
testsuite/i386-unknown-linux2.4/tuples
testsuite/i386-unknown-nt4.0/tuples
testsuite/ia64-unknown-linux2.4/tuples
testsuite/make.module.tmpl
testsuite/ppc32_linux/tuples
testsuite/ppc64_linux/tuples
testsuite/rs6000-ibm-aix5.1/tuples
testsuite/sparc-sun-solaris2.8/tuples
testsuite/sparc-sun-solaris2.9/tuples
testsuite/src/dyninst/test1_21.C
testsuite/src/dyninst/test1_22.C
testsuite/src/specification/spec-grouped.pl
testsuite/src/test_driver.C
testsuite/x86_64-unknown-linux2.4/tuples