From 9a6dcbf895f9da01768e64b73cec88c16157d91e Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 26 Mar 2019 23:25:23 +0100 Subject: New upstream version 1.16.0 --- src/nm-ip6-config.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/nm-ip6-config.h') diff --git a/src/nm-ip6-config.h b/src/nm-ip6-config.h index 862f237d..557e3796 100644 --- a/src/nm-ip6-config.h +++ b/src/nm-ip6-config.h @@ -130,10 +130,12 @@ void nm_ip6_config_subtract (NMIP6Config *dst, guint32 default_route_metric_penalty); void nm_ip6_config_intersect (NMIP6Config *dst, const NMIP6Config *src, + gboolean intersect_addresses, gboolean intersect_routes, guint32 default_route_metric_penalty); NMIP6Config *nm_ip6_config_intersect_alloc (const NMIP6Config *a, const NMIP6Config *b, + gboolean intersect_addresses, gboolean intersect_routes, guint32 default_route_metric_penalty); gboolean nm_ip6_config_replace (NMIP6Config *dst, const NMIP6Config *src, gboolean *relevant_changes); -- cgit 1.3.0-6-gf8a5 From 85563b7fc7ec2cd21e38debb9b28db342e2e8e7c Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sun, 21 Apr 2019 21:09:51 +0200 Subject: New upstream version 1.18.0 --- src/nm-ip6-config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/nm-ip6-config.h') diff --git a/src/nm-ip6-config.h b/src/nm-ip6-config.h index 557e3796..86786ea8 100644 --- a/src/nm-ip6-config.h +++ b/src/nm-ip6-config.h @@ -25,7 +25,7 @@ #include "nm-setting-ip6-config.h" -#include "nm-utils/nm-dedup-multi.h" +#include "nm-glib-aux/nm-dedup-multi.h" #include "platform/nmp-object.h" /*****************************************************************************/ -- cgit 1.3.0-6-gf8a5