]> err.no Git - systemd/commitdiff
projects / systemd / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 17754a5 7e551fb)
Merge commit 'v6'
authorTollef Fog Heen <tfheen@err.no>
Sat, 7 Aug 2010 05:07:14 +0000 (07:07 +0200)
committerTollef Fog Heen <tfheen@err.no>
Sat, 7 Aug 2010 05:07:14 +0000 (07:07 +0200)
1  2 
Makefile.am patch | diff1 | diff2 | blob | history

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