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
..
Makefile.am	core: require gio	2009-08-20 13:00:37 -05:00
nm-suse-connection.c	ifcfg-suse: port to new settings API	2009-08-12 17:13:08 -05:00
nm-suse-connection.h	License header and FSF address update	2008-12-20 09:46:41 -05:00
parser.c	system-settings: kill usage of sha1 since NM can handle passphrases now	2009-06-05 22:09:39 -04:00
parser.h	2008-06-26 Dan Williams <dcbw@redhat.com>	2008-06-26 18:31:52 +00:00
plugin.c	Merge commit 'origin/master' into polkit1	2009-08-21 14:12:31 -05:00
plugin.h	2008-06-26 Dan Williams <dcbw@redhat.com>	2008-06-26 18:31:52 +00:00
shvar.c	2008-06-26 Dan Williams <dcbw@redhat.com>	2008-06-26 18:31:52 +00:00
shvar.h	2008-06-26 Dan Williams <dcbw@redhat.com>	2008-06-26 18:31:52 +00:00