diff options
| author | Michael Biebl <biebl@debian.org> | 2016-08-03 23:00:16 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2016-08-03 23:00:16 +0200 |
| commit | 511e94811644318cc196e197616fdc558030e8e3 (patch) | |
| tree | 1ea5c895be190982cc686d43ebed62ae33d60426 /src/nm-enum-types.h | |
| parent | fb15332b981b5637ae4aeadc546e2f46bf333cd1 (diff) | |
| parent | d6201f5d8daada3d64a0a3e0038e14eebec683ce (diff) | |
Merge tag 'upstream/1.2.4'
Upstream version 1.2.4
Diffstat (limited to 'src/nm-enum-types.h')
| -rw-r--r-- | src/nm-enum-types.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/nm-enum-types.h b/src/nm-enum-types.h index 8fe52e19..36a9c270 100644 --- a/src/nm-enum-types.h +++ b/src/nm-enum-types.h @@ -18,8 +18,6 @@ GType nm_dhcp_state_get_type (void) G_GNUC_CONST; #define NM_TYPE_DHCP_STATE (nm_dhcp_state_get_type ()) GType nm_dns_ip_config_type_get_type (void) G_GNUC_CONST; #define NM_TYPE_DNS_IP_CONFIG_TYPE (nm_dns_ip_config_type_get_type ()) -GType nm_dns_manager_resolv_conf_mode_get_type (void) G_GNUC_CONST; -#define NM_TYPE_DNS_MANAGER_RESOLV_CONF_MODE (nm_dns_manager_resolv_conf_mode_get_type ()) GType nm_dns_manager_resolv_conf_manager_get_type (void) G_GNUC_CONST; #define NM_TYPE_DNS_MANAGER_RESOLV_CONF_MANAGER (nm_dns_manager_resolv_conf_manager_get_type ()) GType nm_dns_masq_status_get_type (void) G_GNUC_CONST; |