Merge ../../thrdb/dyninst into HEAD
authorMatthew P. Legendre <legendre@zeus286.llnl.gov>
Sat, 29 Jan 2011 00:06:11 +0000 (16:06 -0800)
committerMatthew P. Legendre <legendre@zeus286.llnl.gov>
Sat, 29 Jan 2011 00:06:11 +0000 (16:06 -0800)
commitd5e1e14986adee218497008612a3fd696d1ca9b4
tree33997105e5a15d2ae6d591d7a4f49fe0c3099b59
parentfd7c1f79a6dfe0138e8d554909399bb55b118ca6
parente8af87cf0d4637db3f47c9be7591721e9bb8d24d
Merge ../../thrdb/dyninst into HEAD

Conflicts:

Makefile
proccontrol/h/EventType.h
proccontrol/h/Process.h
proccontrol/make.module.tmpl
proccontrol/src/event.C
proccontrol/src/freebsd.C
proccontrol/src/int_process.h
proccontrol/src/linux.C
proccontrol/src/process.C
testsuite/amd64-unknown-freebsd7.2/make.solo_mutatee.gen
testsuite/amd64-unknown-freebsd7.2/tuples
testsuite/i386-unknown-freebsd7.2/make.solo_mutatee.gen
testsuite/i386-unknown-freebsd7.2/tuples
testsuite/i386-unknown-linux2.4/make.solo_mutatee.gen
testsuite/i386-unknown-linux2.4/tuples
testsuite/x86_64-unknown-linux2.4/make.solo_mutatee.gen
testsuite/x86_64-unknown-linux2.4/tuples
40 files changed:
Makefile
configure
dyninstAPI/src/pcEventHandler.C
make.config
parseThat/Makefile.in
proccontrol/h/Event.h
proccontrol/h/EventType.h
proccontrol/h/Process.h
proccontrol/make.module.tmpl
proccontrol/src/event.C
proccontrol/src/freebsd.C
proccontrol/src/freebsd.h
proccontrol/src/handler.C
proccontrol/src/int_handler.h
proccontrol/src/int_process.h
proccontrol/src/int_thread_db.C
proccontrol/src/int_thread_db.h
proccontrol/src/linux.C
proccontrol/src/linux.h
proccontrol/src/process.C
stackwalk/src/procstate.C
testsuite/amd64-unknown-freebsd7.2/make.mutators.gen
testsuite/amd64-unknown-freebsd7.2/make.solo_mutatee.gen
testsuite/amd64-unknown-freebsd7.2/test_info_new.gen.C
testsuite/amd64-unknown-freebsd7.2/tuples
testsuite/i386-unknown-freebsd7.2/make.mutators.gen
testsuite/i386-unknown-freebsd7.2/make.solo_mutatee.gen
testsuite/i386-unknown-freebsd7.2/test_info_new.gen.C
testsuite/i386-unknown-freebsd7.2/tuples
testsuite/i386-unknown-linux2.4/make.mutators.gen
testsuite/i386-unknown-linux2.4/make.solo_mutatee.gen
testsuite/i386-unknown-linux2.4/test_info_new.gen.C
testsuite/i386-unknown-linux2.4/tuples
testsuite/make.module.tmpl
testsuite/src/proccontrol/pc_irpc.C
testsuite/src/specification/spec-grouped.pl
testsuite/x86_64-unknown-linux2.4/make.mutators.gen
testsuite/x86_64-unknown-linux2.4/make.solo_mutatee.gen
testsuite/x86_64-unknown-linux2.4/test_info_new.gen.C
testsuite/x86_64-unknown-linux2.4/tuples