diff options
| author | Sebastien Bacher <seb128@ubuntu.com> | 2019-01-25 10:52:15 +0100 |
|---|---|---|
| committer | Sebastien Bacher <seb128@ubuntu.com> | 2019-01-25 11:24:27 +0100 |
| commit | e8ac7dacdcf4b38addef4f8ac6ab038f9d29582c (patch) | |
| tree | 017883e210043859ee695250f6285380b795f8e4 /libnm-core/nm-connection.h | |
| parent | b05c072fe2594e0369cbfb00a3fba176d2d309dc (diff) | |
| parent | 1b878e595ff7be634a4800ca6cc506046e49548e (diff) | |
Merge remote-tracking branch 'salsa/master' into disco
Diffstat (limited to 'libnm-core/nm-connection.h')
| -rw-r--r-- | libnm-core/nm-connection.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libnm-core/nm-connection.h b/libnm-core/nm-connection.h index 6d23cfdb..802f68ba 100644 --- a/libnm-core/nm-connection.h +++ b/libnm-core/nm-connection.h @@ -16,7 +16,7 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * Copyright 2007 - 2017 Red Hat, Inc. + * Copyright 2007 - 2018 Red Hat, Inc. * Copyright 2007 - 2008 Novell, Inc. */ @@ -231,6 +231,7 @@ NMSettingProxy * nm_connection_get_setting_proxy (NMConnec NMSettingSerial * nm_connection_get_setting_serial (NMConnection *connection); NM_AVAILABLE_IN_1_12 NMSettingTCConfig * nm_connection_get_setting_tc_config (NMConnection *connection); +NM_AVAILABLE_IN_1_2 NMSettingTun * nm_connection_get_setting_tun (NMConnection *connection); NMSettingVpn * nm_connection_get_setting_vpn (NMConnection *connection); NMSettingWimax * nm_connection_get_setting_wimax (NMConnection *connection); |