diff options
| author | Michael Biebl <biebl@debian.org> | 2016-03-01 16:56:10 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2016-03-01 16:56:10 +0100 |
| commit | e62b307a9dd108e664aa507355ed3dd15a9c6d67 (patch) | |
| tree | 2957d1a0dde11be8bd9f506f8b075d21b85da2d0 /docs/libnm-util/html/libnm-util.devhelp2 | |
| parent | de39787fedbff438bd933c30675fc5c026db6aa0 (diff) | |
| parent | c2de0d98ba39e0a1a970d066fd19be786092f376 (diff) | |
Merge tag 'upstream/1.1.91'
Upstream version 1.1.91
Diffstat (limited to 'docs/libnm-util/html/libnm-util.devhelp2')
| -rw-r--r-- | docs/libnm-util/html/libnm-util.devhelp2 | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/docs/libnm-util/html/libnm-util.devhelp2 b/docs/libnm-util/html/libnm-util.devhelp2 index 987b876a..e1526746 100644 --- a/docs/libnm-util/html/libnm-util.devhelp2 +++ b/docs/libnm-util/html/libnm-util.devhelp2 @@ -1552,6 +1552,9 @@ <keyword type="constant" name="NM_DEVICE_TYPE_TEAM" link="libnm-util-NetworkManager.html#NM-DEVICE-TYPE-TEAM:CAPS"/> <keyword type="constant" name="NM_DEVICE_TYPE_TUN" link="libnm-util-NetworkManager.html#NM-DEVICE-TYPE-TUN:CAPS"/> <keyword type="constant" name="NM_DEVICE_TYPE_IP_TUNNEL" link="libnm-util-NetworkManager.html#NM-DEVICE-TYPE-IP-TUNNEL:CAPS"/> + <keyword type="constant" name="NM_DEVICE_TYPE_MACVLAN" link="libnm-util-NetworkManager.html#NM-DEVICE-TYPE-MACVLAN:CAPS"/> + <keyword type="constant" name="NM_DEVICE_TYPE_VXLAN" link="libnm-util-NetworkManager.html#NM-DEVICE-TYPE-VXLAN:CAPS"/> + <keyword type="constant" name="NM_DEVICE_TYPE_VETH" link="libnm-util-NetworkManager.html#NM-DEVICE-TYPE-VETH:CAPS"/> <keyword type="constant" name="NM_DEVICE_CAP_NONE" link="libnm-util-NetworkManager.html#NM-DEVICE-CAP-NONE:CAPS"/> <keyword type="constant" name="NM_DEVICE_CAP_NM_SUPPORTED" link="libnm-util-NetworkManager.html#NM-DEVICE-CAP-NM-SUPPORTED:CAPS"/> <keyword type="constant" name="NM_DEVICE_CAP_CARRIER_DETECT" link="libnm-util-NetworkManager.html#NM-DEVICE-CAP-CARRIER-DETECT:CAPS"/> |