git.dyninst.org Git - dyninst.git/commit

projects / dyninst.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 48fc1ec 98d89b8)

author	Matthew P. Legendre <legendre@cab667.llnl.gov>
	Fri, 6 Jul 2012 20:26:37 +0000 (13:26 -0700)
committer	Matthew P. Legendre <legendre@cab667.llnl.gov>
	Fri, 6 Jul 2012 20:26:37 +0000 (13:26 -0700)
commit	e676115f72639019214f92828b4e90417876a580
tree	5f4a5897926fb77ce24228ac1ee7018edb38a95a	tree \| snapshot
parent	48fc1ec477f119131255c895fe294e7718d70cc0	commit \| diff
parent	98d89b8ee00772635d2de55c2d9aef49cf51c583	commit \| diff

Merge branch 'dyninst_proccontrol' of git.dyninst.org:/pub/dyninst into dyninst_proccontrol

Conflicts:
testsuite/x86_64_cnl/make.solo_mutatee.gen
testsuite/x86_64_cnl/tuples

13 files changed:

stackwalk/i386-unknown-linux2.4/Makefile	diff1 \|	diff2 \|	blob \| history
symtabAPI/src/Object-elf.C	diff1 \|	diff2 \|	blob \| history
testsuite/amd64-unknown-freebsd7.2/make.solo_mutatee.gen	diff1 \|	diff2 \|	blob \| history
testsuite/i386-unknown-freebsd7.2/make.solo_mutatee.gen	diff1 \|	diff2 \|	blob \| history
testsuite/i386-unknown-linux2.4/make.solo_mutatee.gen	diff1 \|	diff2 \|	blob \| history
testsuite/ppc32_bgp/make.solo_mutatee.gen	diff1 \|	diff2 \|	blob \| history
testsuite/ppc32_bgp_ion/make.solo_mutatee.gen	diff1 \|	diff2 \|	blob \| history
testsuite/ppc32_linux/make.solo_mutatee.gen	diff1 \|	diff2 \|	blob \| history
testsuite/ppc64_bgq_ion/make.solo_mutatee.gen	diff1 \|	diff2 \|	blob \| history
testsuite/ppc64_linux/make.solo_mutatee.gen	diff1 \|	diff2 \|	blob \| history
testsuite/rs6000-ibm-aix5.1/make.solo_mutatee.gen	diff1 \|	diff2 \|	blob \| history
testsuite/src/specification/makemake.py	diff1 \|	diff2 \|	blob \| history
testsuite/x86_64-unknown-linux2.4/make.solo_mutatee.gen	diff1 \|	diff2 \|	blob \| history

Dyninst API