NetworkManager/system-settings/plugins/ifupdown
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
..
interface_parser.c everything: use libgudev instead of HAL; merge NM and nm-system-settings 2009-06-11 00:39:12 -04:00
interface_parser.h License header and FSF address update 2008-12-20 09:46:41 -05:00
Makefile.am build: always link locally-built libraries first (bgo #580131) 2009-08-20 12:31:17 -05:00
nm-ifupdown-connection.c ifupdown: port to new settings API 2009-08-12 17:13:24 -05:00
nm-ifupdown-connection.h License header and FSF address update 2008-12-20 09:46:41 -05:00
parser.c ifupdown: port to new settings API 2009-08-12 17:13:24 -05:00
parser.h ifupdown: port to new settings API 2009-08-12 17:13:24 -05:00
plugin.c ifupdown: port to new settings API 2009-08-12 17:13:24 -05:00
plugin.h License header and FSF address update 2008-12-20 09:46:41 -05:00