]> err.no Git - util-linux/commit
projects / util-linux / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: e218b8a 3dafbfb)
Merge commit 'origin/master'
authorLaMont Jones <lamont@debian.org>
Fri, 20 Mar 2009 16:36:40 +0000 (10:36 -0600)
committerLaMont Jones <lamont@debian.org>
Fri, 20 Mar 2009 16:36:40 +0000 (10:36 -0600)
commit4923b27bb6c6ff2b357b3e7e68e72c4c6023f98b
tree3b371c4f47f6a61796d297b7229bb26a2b177f13tree | snapshot
parente218b8a8c0f7a9f9eb3591a91d2e2120da4171c8commit | diff
parent3dafbfb726a97d0fe624a19b8690094998796495commit | diff
Merge commit 'origin/master'

Conflicts:

NEWS
config/include-Makefile.am
configure.ac
mount/Makefile.am
mount/mount.c
po/ca.po
po/cs.po
po/da.po
po/de.po
po/es.po
po/et.po
po/eu.po
po/fi.po
po/fr.po
po/hu.po
po/id.po
po/it.po
po/ja.po
po/nl.po
po/pl.po
po/pt_BR.po
po/ru.po
po/sl.po
po/sv.po
po/tr.po
po/uk.po
po/util-linux-ng.pot
po/vi.po
po/zh_CN.po
hwclock/hwclock.8 diff1 | diff2 | blob | history
hwclock/hwclock.c diff1 | diff2 | blob | history
mount/Makefile.am diff1 | diff2 | blob | history
mount/lomount.c diff1 | diff2 | blob | history
mount/losetup.8 diff1 | diff2 | blob | history
mount/mount.c diff1 | diff2 | blob | history
mount/swapon.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.