From 81836c2d44802b4cca833d7775dd627e0797a7e2 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Fri, 28 Aug 2015 01:13:48 +0200 Subject: Imported Upstream version 1.0.6 --- src/nm-enum-types.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/nm-enum-types.h') diff --git a/src/nm-enum-types.h b/src/nm-enum-types.h index 86f17f04..0997211e 100644 --- a/src/nm-enum-types.h +++ b/src/nm-enum-types.h @@ -64,6 +64,8 @@ GType nm_link_type_get_type (void) G_GNUC_CONST; #define NM_TYPE_LINK_TYPE (nm_link_type_get_type ()) GType nm_pobject_type_get_type (void) G_GNUC_CONST; #define NM_TYPE_POBJECT_TYPE (nm_pobject_type_get_type ()) +GType nm_ip_config_merge_flags_get_type (void) G_GNUC_CONST; +#define NM_TYPE_IP_CONFIG_MERGE_FLAGS (nm_ip_config_merge_flags_get_type ()) GType nm_match_spec_match_type_get_type (void) G_GNUC_CONST; #define NM_TYPE_MATCH_SPEC_MATCH_TYPE (nm_match_spec_match_type_get_type ()) GType nm_utils_test_flags_get_type (void) G_GNUC_CONST; -- cgit 1.3.0-6-gf8a5