fix conflicts. Merge branch 'master' of git.dyninst.org:/pub/dyninst
authorJames Waskiewicz <jaw@armour.cs.umd.edu>
Fri, 16 Oct 2009 07:45:00 +0000 (03:45 -0400)
committerJames Waskiewicz <jaw@armour.cs.umd.edu>
Fri, 16 Oct 2009 07:45:00 +0000 (03:45 -0400)
commit3cf2d19462e1005284af326751d080f1bc66e8f8
treed2031f6f04ac6b573cb8016f1324f38c6bdda9f6
parent0491a614d9faff3eab4e0ad6b299dc3a170dfdc8
parent5366bd25d2b0386aff8aec3ad4506d6714d50821
fix conflicts. Merge branch 'master' of git.dyninst.org:/pub/dyninst

Conflicts:
dyninstAPI/src/BPatch_function.C
make.config
testsuite/i386-unknown-linux2.4/make.mutators.gen
testsuite/i386-unknown-linux2.4/tuples
testsuite/i386-unknown-nt4.0/tuples
testsuite/ia64-unknown-linux2.4/make.mutators.gen
testsuite/ia64-unknown-linux2.4/tuples
testsuite/ppc32_linux/make.mutators.gen
testsuite/ppc32_linux/tuples
testsuite/ppc64_linux/make.mutators.gen
testsuite/ppc64_linux/tuples
testsuite/rs6000-ibm-aix5.1/make.mutators.gen
testsuite/rs6000-ibm-aix5.1/tuples
testsuite/sparc-sun-solaris2.8/make.mutators.gen
testsuite/sparc-sun-solaris2.8/tuples
testsuite/sparc-sun-solaris2.9/make.mutators.gen
testsuite/sparc-sun-solaris2.9/tuples
testsuite/x86_64-unknown-linux2.4/make.mutators.gen
testsuite/x86_64-unknown-linux2.4/tuples
25 files changed:
dyninstAPI/src/BPatch_function.C
dyninstAPI/src/multiTramp.C
make.config
symtabAPI/h/Symtab.h
symtabAPI/src/Symtab.C
testsuite/i386-unknown-linux2.4/make.mutators.gen
testsuite/i386-unknown-linux2.4/tuples
testsuite/i386-unknown-nt4.0/nmake.mutators.gen
testsuite/i386-unknown-nt4.0/tuples
testsuite/ia64-unknown-linux2.4/make.mutators.gen
testsuite/ia64-unknown-linux2.4/tuples
testsuite/ppc32_linux/make.mutators.gen
testsuite/ppc32_linux/tuples
testsuite/ppc64_linux/make.mutators.gen
testsuite/ppc64_linux/tuples
testsuite/rs6000-ibm-aix5.1/make.mutators.gen
testsuite/rs6000-ibm-aix5.1/tuples
testsuite/sparc-sun-solaris2.8/make.mutators.gen
testsuite/sparc-sun-solaris2.8/tuples
testsuite/sparc-sun-solaris2.9/make.mutators.gen
testsuite/sparc-sun-solaris2.9/tuples
testsuite/src/specification/spec-grouped.pl
testsuite/src/test_driver.C
testsuite/x86_64-unknown-linux2.4/make.mutators.gen
testsuite/x86_64-unknown-linux2.4/tuples