Dan Williams e2b13be3d9 Merge commit 'origin/master' into polkit1 ... Conflicts: libnm-glib/Makefile.am src/system-settings/nm-sysconfig-settings.c system-settings/plugins/ifcfg-rh/plugin.c		2009-08-21 14:12:31 -05:00
..
io	libnm-glib: implement new settings interfaces	2009-07-23 09:20:52 -04:00
tests	build: always link locally-built libraries first (bgo #580131)	2009-08-20 12:31:17 -05:00
Makefile.am	core: require gio	2009-08-20 13:00:37 -05:00
nm-keyfile-connection.c	libnm-glib: implement new settings interfaces	2009-07-23 09:20:52 -04:00
nm-keyfile-connection.h	Update license headers	2008-11-03 16:05:11 +00:00
plugin.c	Merge commit 'origin/master' into polkit1	2009-08-21 14:12:31 -05:00
plugin.h	Update license headers	2008-11-03 16:05:11 +00:00