On 22/09/13 20:25, Ashley Whetter wrote: > From: Allan McRae <[email protected]> > > Build makepkg to scripts/.lib/makepkg and add a wrapper script to > call it. This is not useful at the moment, but is the first step > to allowing makepkg to be split into smaller pieces. > > Signed-off-by: Allan McRae <[email protected]> > (cherry picked from commit 015667ab2c8f0be3b5ff34cc93757e7873a09dbd) > Signed-off-by: Ashley Whetter <[email protected]> > > Conflicts: > scripts/.gitignore > scripts/Makefile.am
These two patches from me are fine. No need to send them yet again. I will remove the "(cherry picked..." line and the conflicts lines when I pull the patch as that is from a working branch and the commit id will be meaningless once that branch is gone. A
