]> err.no Git - systemd/commitdiff
projects / systemd / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1c25ce5 d5ca5f1)
Merge commit 'v4'
authorTollef Fog Heen <tfheen@err.no>
Thu, 29 Jul 2010 12:31:08 +0000 (14:31 +0200)
committerTollef Fog Heen <tfheen@err.no>
Thu, 29 Jul 2010 12:31:08 +0000 (14:31 +0200)
1  2 
Makefile.am patch | diff1 | diff2 | blob | history

diff --cc Makefile.am
Simple merge
systemd, git://git.err.no/systemd