Merge branch 'master' of legendre@git.dyninst.org:/pub/dyninst
authorMatthew Legendre <legendre@coriander.cs.wisc.edu>
Wed, 11 Aug 2010 20:25:27 +0000 (15:25 -0500)
committerMatthew Legendre <legendre@coriander.cs.wisc.edu>
Wed, 11 Aug 2010 20:25:27 +0000 (15:25 -0500)
commit81a287926e1e16e52669764594b8f4ff2419ce36
treee8f36e467a6d83f52a4d72f010b1048e9fa37ea7
parent2bd7af217b698415a2d97c3f3f159870497dd412
parent5b4c74242509cc0102f7b2ef9a58b83d4733e5cd
Merge branch 'master' of legendre@git.dyninst.org:/pub/dyninst

Conflicts:
testsuite/Makefile
testsuite/i386-unknown-linux2.4/test_info_new.gen.C
testsuite/i386-unknown-linux2.4/tuples
testsuite/i386-unknown-nt4.0/test_info_new.gen.C
testsuite/i386-unknown-nt4.0/tuples
testsuite/ia64-unknown-linux2.4/test_info_new.gen.C
testsuite/ia64-unknown-linux2.4/tuples
testsuite/ppc32_linux/tuples
testsuite/ppc64_linux/tuples
testsuite/rs6000-ibm-aix5.1/test_info_new.gen.C
testsuite/rs6000-ibm-aix5.1/tuples
testsuite/sparc-sun-solaris2.8/test_info_new.gen.C
testsuite/sparc-sun-solaris2.8/tuples
testsuite/sparc-sun-solaris2.9/test_info_new.gen.C
testsuite/sparc-sun-solaris2.9/tuples
testsuite/src/dyninst/dyninst_comp.C
testsuite/src/dyninst/test_fork_5.C
testsuite/src/specification/spec-grouped.pl
testsuite/x86_64-unknown-linux2.4/test_info_new.gen.C
testsuite/x86_64-unknown-linux2.4/tuples
43 files changed:
common/x86_64_cnl/Makefile
make.config
proccontrol/h/Process.h
proccontrol/src/handler.C
proccontrol/src/int_process.h
proccontrol/src/linux.C
proccontrol/src/process.C
proccontrol/src/sysv.C
testsuite/Makefile
testsuite/i386-unknown-linux2.4/dyninst_cxx_group_test_group.c
testsuite/i386-unknown-linux2.4/symtab_group_test_group.c
testsuite/i386-unknown-linux2.4/test_info_new.gen.C
testsuite/i386-unknown-linux2.4/tuples
testsuite/i386-unknown-nt4.0/test_info_new.gen.C
testsuite/i386-unknown-nt4.0/tuples
testsuite/make.module.tmpl
testsuite/ppc32_linux/dyninst_cxx_group_test_group.c
testsuite/ppc32_linux/symtab_group_test_group.c
testsuite/ppc32_linux/tuples
testsuite/ppc64_linux/dyninst_cxx_group_test_group.c
testsuite/ppc64_linux/symtab_group_test_group.c
testsuite/ppc64_linux/tuples
testsuite/rs6000-ibm-aix5.1/dyninst_cxx_group_test_group.c
testsuite/rs6000-ibm-aix5.1/symtab_group_test_group.c
testsuite/rs6000-ibm-aix5.1/test_info_new.gen.C
testsuite/rs6000-ibm-aix5.1/tuples
testsuite/sparc-sun-solaris2.8/dyninst_cxx_group_test_group.c
testsuite/sparc-sun-solaris2.8/symtab_group_test_group.c
testsuite/sparc-sun-solaris2.8/test_info_new.gen.C
testsuite/sparc-sun-solaris2.8/tuples
testsuite/sparc-sun-solaris2.9/dyninst_cxx_group_test_group.c
testsuite/sparc-sun-solaris2.9/symtab_group_test_group.c
testsuite/sparc-sun-solaris2.9/test_info_new.gen.C
testsuite/sparc-sun-solaris2.9/tuples
testsuite/src/dyninst/dyninst_comp.C
testsuite/src/dyninst/dyninst_comp.h
testsuite/src/dyninst/test2_14.C
testsuite/src/dyninst/test6LS-x86_64.s
testsuite/src/dyninst/test_fork_5.C
testsuite/src/runTests.C
testsuite/src/specification/spec-grouped.pl
testsuite/x86_64-unknown-linux2.4/test_info_new.gen.C
testsuite/x86_64-unknown-linux2.4/tuples