diff options
| author | Michael Biebl <biebl@debian.org> | 2017-01-17 20:25:47 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2017-01-17 20:25:47 +0100 |
| commit | bed53db3e064450b56e23ec654f40a3bafe58815 (patch) | |
| tree | 314508d6c904b1224dab2070e0cfdd5a02d7dd89 /libnm/NetworkManager.h | |
| parent | 7135a6e87c938139e3a5db121d62dcaa783345d1 (diff) | |
| parent | 58f8be580039b0575b197b9573a1c92745d96d30 (diff) | |
Merge tag 'upstream/1.5.90' into experimental
Upstream version 1.5.90
Diffstat (limited to 'libnm/NetworkManager.h')
| -rw-r--r-- | libnm/NetworkManager.h | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/libnm/NetworkManager.h b/libnm/NetworkManager.h index b5dab8fd..d0dec1a0 100644 --- a/libnm/NetworkManager.h +++ b/libnm/NetworkManager.h @@ -36,10 +36,14 @@ #include <nm-device-ethernet.h> #include <nm-device-generic.h> #include <nm-device-infiniband.h> +#include <nm-device-ip-tunnel.h> +#include <nm-device-macvlan.h> #include <nm-device-modem.h> #include <nm-device-olpc-mesh.h> #include <nm-device-team.h> +#include <nm-device-tun.h> #include <nm-device-vlan.h> +#include <nm-device-vxlan.h> #include <nm-device-wifi.h> #include <nm-device-wimax.h> #include <nm-device.h> @@ -52,33 +56,35 @@ #include <nm-setting-adsl.h> #include <nm-setting-bluetooth.h> #include <nm-setting-bond.h> -#include <nm-setting-bridge-port.h> #include <nm-setting-bridge.h> +#include <nm-setting-bridge-port.h> #include <nm-setting-cdma.h> #include <nm-setting-connection.h> #include <nm-setting-dcb.h> #include <nm-setting-generic.h> #include <nm-setting-gsm.h> #include <nm-setting-infiniband.h> -#include <nm-setting-ip-config.h> -#include <nm-setting-ip-tunnel.h> #include <nm-setting-ip4-config.h> #include <nm-setting-ip6-config.h> +#include <nm-setting-ip-config.h> +#include <nm-setting-ip-tunnel.h> +#include <nm-setting-macsec.h> #include <nm-setting-macvlan.h> #include <nm-setting-olpc-mesh.h> #include <nm-setting-ppp.h> #include <nm-setting-pppoe.h> +#include <nm-setting-proxy.h> #include <nm-setting-serial.h> -#include <nm-setting-team-port.h> #include <nm-setting-team.h> +#include <nm-setting-team-port.h> #include <nm-setting-tun.h> #include <nm-setting-vlan.h> #include <nm-setting-vpn.h> #include <nm-setting-vxlan.h> #include <nm-setting-wimax.h> #include <nm-setting-wired.h> -#include <nm-setting-wireless-security.h> #include <nm-setting-wireless.h> +#include <nm-setting-wireless-security.h> #include <nm-setting.h> #include <nm-simple-connection.h> #include <nm-utils.h> |