Merge remote branch 'origin/master' into wimax
authorDan Williams <dcbw@redhat.com>
Wed, 19 May 2010 15:55:26 +0000 (08:55 -0700)
committerDan Williams <dcbw@redhat.com>
Wed, 19 May 2010 15:55:26 +0000 (08:55 -0700)
commitc4f3bf002b547971c358d1c34f097dd28fe90bf0
treebe8006084ce30e60b8c341d83228c5af866aff09
parent7a36b31cedbbc8b07e12e1ba2fa8ca9d4ace5d9a
parent87ac1bd5f57d46c5035b2ed922eabb1506cac5fa
Merge remote branch 'origin/master' into wimax
19 files changed:
configure.ac
include/NetworkManager.h
introspection/Makefile.am
introspection/all.xml
introspection/nm-manager.xml
libnm-glib/Makefile.am
libnm-glib/libnm-glib.ver
libnm-glib/nm-device.c
libnm-util/Makefile.am
libnm-util/libnm-util.ver
src/Makefile.am
src/main.c
src/nm-device-olpc-mesh.c
src/nm-manager.c
src/nm-udev-manager.c
src/wimax/nm-wimax-device.c
src/wimax/nm-wimax-device.h
src/wimax/nm-wimax-manager.c
src/wimax/nm-wimax-manager.h