[network-manager-applet: 5/5] merge: branch 'lr/gapplication'



commit 67b2ff9cd9aa890dab22859a3e5f7677d927f7a8
Merge: eb03e37 9c1b8ea
Author: Lubomir Rintel <lkundrak v3 sk>
Date:   Tue May 22 10:00:07 2018 +0200

    merge: branch 'lr/gapplication'
    
    https://bugzilla.gnome.org/show_bug.cgi?id=796211

 Makefile.am                                     |    1 +
 po/POTFILES.in                                  |    1 +
 src/connection-editor/ce.gresource.xml          |    3 +-
 src/connection-editor/connection-helpers.c      |    2 +-
 src/connection-editor/gtk/menus.ui              |   19 ++
 src/connection-editor/ip4-routes-dialog.c       |    2 +-
 src/connection-editor/ip6-routes-dialog.c       |    2 +-
 src/connection-editor/main.c                    |  322 ++++++++---------------
 src/connection-editor/meson.build               |    1 +
 src/connection-editor/nm-connection-editor.c    |    4 +-
 src/connection-editor/nm-connection-list.c      |    4 +-
 src/connection-editor/nm-connection-list.h      |    4 +-
 src/connection-editor/nm-connection-list.ui     |    2 +-
 src/connection-editor/page-bluetooth.c          |    2 +-
 src/connection-editor/page-bond.c               |    2 +-
 src/connection-editor/page-bridge-port.c        |    2 +-
 src/connection-editor/page-bridge.c             |    2 +-
 src/connection-editor/page-dcb.c                |    2 +-
 src/connection-editor/page-dsl.c                |    2 +-
 src/connection-editor/page-ethernet.c           |    2 +-
 src/connection-editor/page-general.c            |    2 +-
 src/connection-editor/page-infiniband.c         |    2 +-
 src/connection-editor/page-ip-tunnel.c          |    2 +-
 src/connection-editor/page-ip4.c                |    2 +-
 src/connection-editor/page-ip6.c                |    2 +-
 src/connection-editor/page-macsec.c             |    2 +-
 src/connection-editor/page-mobile.c             |    2 +-
 src/connection-editor/page-ppp.c                |    2 +-
 src/connection-editor/page-proxy.c              |    2 +-
 src/connection-editor/page-team-port.c          |    2 +-
 src/connection-editor/page-team.c               |    2 +-
 src/connection-editor/page-vlan.c               |    2 +-
 src/connection-editor/page-wifi-security.c      |    2 +-
 src/connection-editor/page-wifi.c               |    2 +-
 src/connection-editor/ppp-auth-methods-dialog.c |    2 +-
 35 files changed, 164 insertions(+), 247 deletions(-)
---


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]