diff options
| author | Michael Biebl <biebl@debian.org> | 2012-08-07 14:23:39 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2012-08-07 14:23:39 +0200 |
| commit | 543d05fc6d12cc608dc37ae97d4843431c6de4a8 (patch) | |
| tree | def16257d58256bc116737bdc04edce693a656de /docs/libnm-util/html/libnm-util.devhelp2 | |
| parent | 73f59c42ef878adf32efe8c7c4cb0d50ea2d04a1 (diff) | |
| parent | 7f1d08cf21e97f5e60d4636bb1e6c287c34ee2df (diff) | |
Merge tag 'upstream/0.9.5.96' into experimental
Upstream version 0.9.5.96
Diffstat (limited to 'docs/libnm-util/html/libnm-util.devhelp2')
| -rw-r--r-- | docs/libnm-util/html/libnm-util.devhelp2 | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/docs/libnm-util/html/libnm-util.devhelp2 b/docs/libnm-util/html/libnm-util.devhelp2 index fb3955a3..93646eec 100644 --- a/docs/libnm-util/html/libnm-util.devhelp2 +++ b/docs/libnm-util/html/libnm-util.devhelp2 @@ -135,11 +135,6 @@ <keyword type="macro" name="NM_SETTING_CONNECTION_TYPE" link="NMSettingConnection.html#NM-SETTING-CONNECTION-TYPE:CAPS"/> <keyword type="macro" name="NM_SETTING_CONNECTION_UUID" link="NMSettingConnection.html#NM-SETTING-CONNECTION-UUID:CAPS"/> <keyword type="macro" name="NM_SETTING_CONNECTION_ZONE" link="NMSettingConnection.html#NM-SETTING-CONNECTION-ZONE:CAPS"/> - <keyword type="macro" name="NM_SETTING_CONNECTION_ZONE_BLOCK" link="NMSettingConnection.html#NM-SETTING-CONNECTION-ZONE-BLOCK:CAPS"/> - <keyword type="macro" name="NM_SETTING_CONNECTION_ZONE_HOME" link="NMSettingConnection.html#NM-SETTING-CONNECTION-ZONE-HOME:CAPS"/> - <keyword type="macro" name="NM_SETTING_CONNECTION_ZONE_PUBLIC" link="NMSettingConnection.html#NM-SETTING-CONNECTION-ZONE-PUBLIC:CAPS"/> - <keyword type="macro" name="NM_SETTING_CONNECTION_ZONE_TRUSTED" link="NMSettingConnection.html#NM-SETTING-CONNECTION-ZONE-TRUSTED:CAPS"/> - <keyword type="macro" name="NM_SETTING_CONNECTION_ZONE_WORK" link="NMSettingConnection.html#NM-SETTING-CONNECTION-ZONE-WORK:CAPS"/> <keyword type="function" name="nm_setting_connection_add_permission ()" link="NMSettingConnection.html#nm-setting-connection-add-permission"/> <keyword type="function" name="nm_setting_connection_error_quark ()" link="NMSettingConnection.html#nm-setting-connection-error-quark"/> <keyword type="function" name="nm_setting_connection_get_autoconnect ()" link="NMSettingConnection.html#nm-setting-connection-get-autoconnect"/> @@ -956,6 +951,7 @@ <keyword type="macro" name="NM_UTILS_HWADDR_LEN_MAX" link="libnm-util-nm-utils.html#NM-UTILS-HWADDR-LEN-MAX:CAPS"/> <keyword type="function" name="nm_utils_deinit ()" link="libnm-util-nm-utils.html#nm-utils-deinit"/> <keyword type="function" name="nm_utils_escape_ssid ()" link="libnm-util-nm-utils.html#nm-utils-escape-ssid"/> + <keyword type="function" name="nm_utils_file_is_pkcs12 ()" link="libnm-util-nm-utils.html#nm-utils-file-is-pkcs12"/> <keyword type="function" name="nm_utils_gvalue_hash_dup ()" link="libnm-util-nm-utils.html#nm-utils-gvalue-hash-dup"/> <keyword type="function" name="nm_utils_hwaddr_atoba ()" link="libnm-util-nm-utils.html#nm-utils-hwaddr-atoba"/> <keyword type="function" name="nm_utils_hwaddr_aton ()" link="libnm-util-nm-utils.html#nm-utils-hwaddr-aton"/> |