]> err.no Git - systemd/commitdiff
projects / systemd / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c05dad9 0185773)
Merge branch 'master' into debian
authorTollef Fog Heen <tfheen@err.no>
Tue, 7 Feb 2012 20:36:16 +0000 (21:36 +0100)
committerTollef Fog Heen <tfheen@err.no>
Tue, 7 Feb 2012 20:36:16 +0000 (21:36 +0100)
1  2 
units/getty@.service.m4 patch | diff1 | diff2 | blob | history
units/remount-rootfs.service patch | diff1 | diff2 | blob | history

diff --cc units/getty@.service.m4
Simple merge
diff --cc units/remount-rootfs.service
Simple merge
systemd, git://git.err.no/systemd