]> err.no Git - systemd/commitdiff
projects / systemd / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0ca6e8a 015f26d)
Merge branch 'master' into debian
authorTollef Fog Heen <tfheen@err.no>
Mon, 11 Apr 2011 19:26:54 +0000 (21:26 +0200)
committerTollef Fog Heen <tfheen@err.no>
Mon, 11 Apr 2011 19:26:54 +0000 (21:26 +0200)
Conflicts:
units/var-lock.mount

1  2 
src/fsck.c patch | diff1 | diff2 | blob | history
units/getty@.service.m4 patch | diff1 | diff2 | blob | history

diff --cc src/fsck.c
Simple merge
diff --cc units/getty@.service.m4
Simple merge
systemd, git://git.err.no/systemd