[network-manager-applet/btdun: 38/39] Merge commit 'origin/master' into btdun
- From: Dan Williams <dcbw src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [network-manager-applet/btdun: 38/39] Merge commit 'origin/master' into btdun
- Date: Wed, 27 Jan 2010 01:53:25 +0000 (UTC)
commit 3d4484ff5c997b4a12c7f00e601d5afa8e0adb72
Merge: f2704ea ecf72eb
Author: Dan Williams <dcbw redhat com>
Date: Tue Jan 26 15:45:05 2010 -0800
Merge commit 'origin/master' into btdun
.gitignore | 1 +
configure.ac | 11 +-
po/bg.po | 617 ++--
po/de.po | 343 +-
po/es.po | 401 ++-
po/hu.po | 763 +++--
po/nb.po | 437 ++-
po/pt_BR.po | 423 ++-
po/sl.po | 4936 +++++++++++++-------------
po/sv.po | 240 +-
src/ap-menu-item.c | 43 +-
src/ap-menu-item.h | 10 +-
src/applet-dbus-manager.c | 13 +-
src/applet-device-wifi.c | 109 +-
src/applet.c | 174 +-
src/applet.h | 13 +-
src/connection-editor/ce-polkit-button.c | 22 +-
src/connection-editor/nm-connection-editor.c | 147 +-
src/connection-editor/nm-connection-editor.h | 8 +-
src/connection-editor/page-ip4.c | 2 +-
src/gconf-helpers/nma-gconf-settings.c | 3 +-
src/main.c | 27 +-
src/utils/Makefile.am | 4 +-
src/utils/gnome-keyring-md5.c | 291 --
src/utils/gnome-keyring-md5.h | 41 -
src/utils/tests/.gitignore | 1 +
src/utils/tests/Makefile.am | 15 +
src/utils/tests/test-utils.c | 481 +++
src/utils/utils.c | 95 +
src/utils/utils.h | 9 +
src/wireless-security/ws-wep-key.c | 1 -
31 files changed, 5218 insertions(+), 4463 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
