]> git.decadent.org.uk Git - odhcp6c.git/commitdiff
projects / odhcp6c.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 74ef11c 7a0a5a7)
Merge remote-tracking branch 'up/master' into hnet
authorMarkus Stenberg <markus.stenberg@iki.fi>
Thu, 1 Aug 2013 09:05:56 +0000 (11:05 +0200)
committerMarkus Stenberg <markus.stenberg@iki.fi>
Thu, 1 Aug 2013 09:05:56 +0000 (11:05 +0200)
1  2 
src/dhcpv6.c patch | diff1 | diff2 | blob | history

diff --cc src/dhcpv6.c
Simple merge
Package: odhcp6c