Merge remote branch 'origin/master' into rm-userset
authorDan Williams <dcbw@redhat.com>
Wed, 12 Jan 2011 21:46:37 +0000 (15:46 -0600)
committerDan Williams <dcbw@redhat.com>
Wed, 12 Jan 2011 21:46:37 +0000 (15:46 -0600)
commitf9ceafd4a124142617280101eda5464ac67c5e39
treecd336e771bf30ba1ee0347037a7f47095fc04c58
parent7de13fa58dca796493b623fcba00d468f3aaa9f6
parent5a35862a1d24fb8d515ea09339123646370c2845
Merge remote branch 'origin/master' into rm-userset
52 files changed:
.gitignore
cli/src/connections.c
configure.ac
examples/C/add-connection-glib.c
examples/C/list-connections-dbus.c
examples/C/list-connections-libnm-glib.c
examples/python/nm-state.py
include/NetworkManager.h
introspection/Makefile.am
introspection/all.xml
introspection/nm-manager-client.xml
introspection/nm-manager.xml
libnm-glib/Makefile.am
libnm-glib/libnm-glib.ver
libnm-glib/nm-client.c
libnm-glib/nm-client.h
libnm-glib/tests/Makefile.am
libnm-glib/tests/test-remote-settings-client.c
libnm-util/libnm-util.ver
libnm-util/nm-connection.c
man/NetworkManager.conf.5.in
po/POTFILES.in
po/sv.po
policy/org.freedesktop.NetworkManager.policy.in
src/Makefile.am
src/logging/nm-logging.c
src/logging/nm-logging.h
src/main.c
src/modem-manager/nm-modem.c
src/nm-device-ethernet.c
src/nm-device-olpc-mesh.c
src/nm-device-wifi.c
src/nm-device.c
src/nm-device.h
src/nm-manager-auth.h
src/nm-manager.c
src/nm-manager.h
src/nm-policy.c
src/nm-wifi-ap.c
src/nm-wifi-ap.h
src/settings/nm-default-wired-connection.c
src/supplicant-manager/nm-supplicant-manager.c
system-settings/plugins/ifcfg-rh/plugin.c
system-settings/plugins/ifcfg-rh/reader.c
system-settings/plugins/ifnet/Makefile.am
system-settings/plugins/ifnet/net_utils.c
system-settings/plugins/ifnet/plugin.c
system-settings/plugins/ifnet/tests/Makefile.am
system-settings/plugins/ifnet/tests/test_all.c
system-settings/plugins/ifupdown/plugin.c
system-settings/plugins/keyfile/plugin.c
test/nm-tool.c