]> err.no Git - systemd/commitdiff
projects / systemd / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 09a2921 54165a3)
Merge remote branch 'origin/master'
authorTollef Fog Heen <tfheen@err.no>
Wed, 7 Jul 2010 20:02:15 +0000 (22:02 +0200)
committerTollef Fog Heen <tfheen@err.no>
Wed, 7 Jul 2010 20:02:15 +0000 (22:02 +0200)
1  2 
Makefile.am patch | diff1 | diff2 | blob | history

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