[network-manager-applet/menu-rework: 15/15] Merge commit 'origin/master' into menu-rework



commit e94ea9b9d129823855a2b67de1b2eddeef1bed36
Merge: fc9c83c... 907904e...
Author: Dan Williams <dcbw redhat com>
Date:   Sat Sep 26 08:40:39 2009 -0700

    Merge commit 'origin/master' into menu-rework

 .gitignore                                     |    1 +
 po/fi.po                                       | 2060 +++++++++++-------------
 src/applet-device-wifi.c                       |    3 -
 src/applet-device-wired.c                      |   21 -
 src/applet.c                                   |    3 +
 src/connection-editor/nm-connection-list.c     |   15 +-
 src/connection-editor/page-dsl.c               |   16 -
 src/connection-editor/page-mobile.c            |   47 +-
 src/connection-editor/page-wired-security.c    |    2 -
 src/connection-editor/page-wireless-security.c |    1 -
 src/gconf-helpers/gconf-helpers.c              |  950 ++++++------
 src/gconf-helpers/gconf-helpers.h              |   36 +-
 src/gconf-helpers/gconf-upgrade.c              |  159 ++
 src/gconf-helpers/gconf-upgrade.h              |    4 +
 src/gconf-helpers/nma-gconf-connection.c       |  233 +++-
 src/gconf-helpers/nma-gconf-settings.c         |    2 +
 src/utils/utils.c                              |  136 --
 src/utils/utils.h                              |    4 -
 src/wireless-dialog.c                          |   10 +-
 src/wireless-security/eap-method-peap.c        |   39 +-
 src/wireless-security/eap-method-tls.c         |  175 +-
 src/wireless-security/eap-method-ttls.c        |   39 +-
 src/wireless-security/eap-method.c             |   31 +-
 src/wireless-security/eap-method.h             |    5 +-
 24 files changed, 2024 insertions(+), 1968 deletions(-)
---



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