]> err.no Git - util-linux/commit
projects / util-linux / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commitda3a62b563b0134fe7f82bca30590b5815933483
tree74da23e36ec77511daabb2fe9fb7d8a4e73475c6tree | snapshot
parent00a72faf189365d6bf00ca9eac63b0c43ecac08fcommit | diff
parent49ef7acdf77066ed05a6c828c261d332c4f54644commit | diff
Merge commit 'origin'

Conflicts:

sys-utils/Makefile.am
sys-utils/setarch.c
sys-utils/Makefile.am diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.