]> git.ipfire.org Git - thirdparty/dhcpcd.git/commitdiff
Merge branch 'memstream'
authorRoy Marples <roy@marples.name>
Thu, 4 Jul 2019 11:22:46 +0000 (12:22 +0100)
committerRoy Marples <roy@marples.name>
Thu, 4 Jul 2019 11:22:46 +0000 (12:22 +0100)
22 files changed:
1  2 
configure
src/arp.c
src/auth.c
src/common.c
src/common.h
src/dhcp-common.c
src/dhcp-common.h
src/dhcp.c
src/dhcp.h
src/dhcp6.c
src/dhcp6.h
src/dhcpcd.c
src/dhcpcd.h
src/ipv4.c
src/ipv4ll.c
src/ipv4ll.h
src/ipv6.c
src/ipv6.h
src/ipv6nd.c
src/ipv6nd.h
src/script.c
src/script.h

diff --cc configure
Simple merge
diff --cc src/arp.c
Simple merge
diff --cc src/auth.c
Simple merge
diff --cc src/common.c
Simple merge
diff --cc src/common.h
Simple merge
Simple merge
Simple merge
diff --cc src/dhcp.c
Simple merge
diff --cc src/dhcp.h
Simple merge
diff --cc src/dhcp6.c
Simple merge
diff --cc src/dhcp6.h
Simple merge
diff --cc src/dhcpcd.c
Simple merge
diff --cc src/dhcpcd.h
Simple merge
diff --cc src/ipv4.c
Simple merge
diff --cc src/ipv4ll.c
Simple merge
diff --cc src/ipv4ll.h
Simple merge
diff --cc src/ipv6.c
Simple merge
diff --cc src/ipv6.h
Simple merge
diff --cc src/ipv6nd.c
Simple merge
diff --cc src/ipv6nd.h
Simple merge
diff --cc src/script.c
Simple merge
diff --cc src/script.h
Simple merge