Searched hist:250118 (Results 1 - 1 of 1) sorted by relevance
| /freebsd-9.3-release/usr.sbin/mergemaster/ | ||
| H A D | mergemaster.sh | diff 250118 Tue Apr 30 18:21:43 MDT 2013 brooks MFC r249906: Use the system MAKEOBJDIRPREFIX when running make targets in mergemaster. This allows bootstrap verions of tools to be used. Add a note to UPDATING about this change. This commit is a partial backout of r248531 in that it removes an accidentally committed change to mergemaster. Discussed with: jhb Sponsored by: DARPA, AFRL |
Completed in 64 milliseconds