Doug Barton e2af94387b Instead of using obj and all targets which are not cross-build aware, ...

use _obj and everything which are.

Submitted by:	ru

2009-01-04 20:59:23 +00:00

..

Makefile

…

mergemaster.8

Add a note to the -m option indicating that you should now specify src/

2009-01-02 22:24:12 +00:00

mergemaster.sh

Instead of using obj and all targets which are not cross-build aware,

2009-01-04 20:59:23 +00:00