diff options
| author | Michael Biebl <biebl@debian.org> | 2012-10-26 21:33:05 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2012-10-26 21:33:05 +0200 |
| commit | 3e08ba570f7e146b67c0f9dfd17dc04987ebac18 (patch) | |
| tree | ec993cb408a2edb4bb48ce86db4eaca09def6260 /docs/libnm-glib/html/libnm-glib.devhelp2 | |
| parent | 74d97e718091bb137b480fb31d740fe20677812b (diff) | |
| parent | 36cb2f364a821e1be50b23e03a18891ec55adb06 (diff) | |
Merge tag 'upstream/0.9.6.4' into experimental
Upstream version 0.9.6.4
Diffstat (limited to 'docs/libnm-glib/html/libnm-glib.devhelp2')
| -rw-r--r-- | docs/libnm-glib/html/libnm-glib.devhelp2 | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/docs/libnm-glib/html/libnm-glib.devhelp2 b/docs/libnm-glib/html/libnm-glib.devhelp2 index 64e57d5f..7f2a66e7 100644 --- a/docs/libnm-glib/html/libnm-glib.devhelp2 +++ b/docs/libnm-glib/html/libnm-glib.devhelp2 @@ -310,12 +310,15 @@ <keyword type="macro" name="NM_DEVICE_BOND_CARRIER" link="NMDeviceBond.html#NM-DEVICE-BOND-CARRIER:CAPS"/> <keyword type="macro" name="NM_DEVICE_BOND_ERROR" link="NMDeviceBond.html#NM-DEVICE-BOND-ERROR:CAPS"/> <keyword type="macro" name="NM_DEVICE_BOND_HW_ADDRESS" link="NMDeviceBond.html#NM-DEVICE-BOND-HW-ADDRESS:CAPS"/> + <keyword type="macro" name="NM_DEVICE_BOND_SLAVES" link="NMDeviceBond.html#NM-DEVICE-BOND-SLAVES:CAPS"/> <keyword type="function" name="nm_device_bond_error_quark ()" link="NMDeviceBond.html#nm-device-bond-error-quark"/> <keyword type="function" name="nm_device_bond_get_carrier ()" link="NMDeviceBond.html#nm-device-bond-get-carrier"/> <keyword type="function" name="nm_device_bond_get_hw_address ()" link="NMDeviceBond.html#nm-device-bond-get-hw-address"/> + <keyword type="function" name="nm_device_bond_get_slaves ()" link="NMDeviceBond.html#nm-device-bond-get-slaves" since="0.9.6.4"/> <keyword type="function" name="nm_device_bond_new ()" link="NMDeviceBond.html#nm-device-bond-new"/> <keyword type="property" name="The "carrier" property" link="NMDeviceBond.html#NMDeviceBond--carrier"/> <keyword type="property" name="The "hw-address" property" link="NMDeviceBond.html#NMDeviceBond--hw-address"/> + <keyword type="property" name="The "slaves" property" link="NMDeviceBond.html#NMDeviceBond--slaves"/> <keyword type="struct" name="NMDeviceInfiniband" link="NMDeviceInfiniband.html#NMDeviceInfiniband-struct"/> <keyword type="struct" name="NMDeviceInfinibandClass" link="NMDeviceInfiniband.html#NMDeviceInfinibandClass"/> <keyword type="enum" name="enum NMDeviceInfinibandError" link="NMDeviceInfiniband.html#NMDeviceInfinibandError"/> |