]> err.no Git - util-linux/commitdiff
projects / util-linux / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 00a72fa 49ef7ac)
Merge commit 'origin'
authorLaMont Jones <lamont@mmjgroup.com>
Tue, 28 Aug 2007 03:51:33 +0000 (21:51 -0600)
committerLaMont Jones <lamont@mmjgroup.com>
Tue, 28 Aug 2007 03:51:33 +0000 (21:51 -0600)
Conflicts:

sys-utils/Makefile.am
sys-utils/setarch.c

1  2 
sys-utils/Makefile.am patch | diff1 | diff2 | blob | history

diff --cc sys-utils/Makefile.am
Simple merge
Unnamed repository; edit this file 'description' to name the repository.