Commit Graph

4 Commits

Author SHA1 Message Date
Julian Seward
ee41ec86f0 Try to fix 'make dist' -- possible fallout from r11188.
git-svn-id: svn://svn.valgrind.org/valgrind/trunk@11213
2010-07-15 13:05:42 +00:00
Nicholas Nethercote
fb6d1e0427 Fix various bits of regtest breakage on amd64-linux caused by the MACOSX106
merge.



git-svn-id: svn://svn.valgrind.org/valgrind/trunk@11199
2010-07-01 01:09:42 +00:00
Nicholas Nethercote
2086d71421 Remove a bogus header file listing.
git-svn-id: svn://svn.valgrind.org/valgrind/trunk@11197
2010-07-01 00:37:46 +00:00
Nicholas Nethercote
6fd0eb7b07 Merged the MACOSX106 branch to the trunk. Merge command:
svn merge -r11143:HEAD svn://svn.valgrind.org/valgrind/branches/MACOSX106

There were some easy-to-resolve conflicts.

Then I had to fix up coregrind/link_tool_exe*.in -- those files had been
added independently on both the trunk and the branch, AFAICT.  I just
overwrote the trunk versions with the branch versions.



git-svn-id: svn://svn.valgrind.org/valgrind/trunk@11194
2010-07-01 00:20:20 +00:00