diff options
| author | Michael Biebl <biebl@debian.org> | 2015-08-28 01:14:03 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2015-08-28 01:14:03 +0200 |
| commit | 235f4801bff27219c6448c83874b5d9f8686ce58 (patch) | |
| tree | 7084e0f7d7a63901c21b56b67fbd3e203d5dbb80 /src/nm-enum-types.h | |
| parent | 79436717ed9d593754a40402b6dc1b0cabac605e (diff) | |
| parent | 81836c2d44802b4cca833d7775dd627e0797a7e2 (diff) | |
Merge tag 'upstream/1.0.6'
Upstream version 1.0.6
Diffstat (limited to 'src/nm-enum-types.h')
| -rw-r--r-- | src/nm-enum-types.h | 2 |
1 files changed, 2 insertions, 0 deletions
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; |