NetworkManager/src
Dan Williams 3ba6495785 2008-03-12 Dan Williams <dcbw@redhat.com>
* src/nm-device.c
		- (merge_ip4_config): avoid duplicates



git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3444 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
2008-03-13 03:52:50 +00:00
..
backends Fix Arch backend compilation 2008-03-12 20:53:11 +00:00
dhcp-manager 2008-03-09 Dan Williams <dcbw@redhat.com> 2008-03-09 05:15:12 +00:00
marshallers 2007-10-01 Dan Williams <dcbw@redhat.com> 2007-10-01 21:26:13 +00:00
named-manager 2008-03-10 Dan Williams <dcbw@redhat.com> 2008-03-10 19:57:55 +00:00
ppp-manager Implement PPPoE. 2008-03-11 16:37:41 +00:00
supplicant-manager 2008-02-05 Dan Williams <dcbw@redhat.com> 2008-02-05 15:44:41 +00:00
vpn-manager 2008-03-07 Dan Williams <dcbw@redhat.com> 2008-03-07 19:41:32 +00:00
.cvsignore 2006-03-05 Dan Williams <dcbw@redhat.com> 2006-03-06 01:10:58 +00:00
autoip.c 2007-09-12 Tambet Ingo <tambet@gmail.com> 2007-09-12 16:23:53 +00:00
autoip.h Wrap in ifdefs to be anal. 2006-01-30 21:53:35 +00:00
gdb-cmd 2006-02-26 Dan Williams <dcbw@redhat.com> 2006-02-27 04:31:52 +00:00
kernel-types.h 2006-01-26 Robert Love <rml@novell.com> 2006-01-26 21:55:11 +00:00
Makefile.am Don't use GNOMELOCALDIR 2008-03-12 19:44:26 +00:00
NetworkManager.c Don't use GNOMELOCALDIR 2008-03-12 19:44:26 +00:00
NetworkManager.conf 2007-11-28 Tambet Ingo <tambet@gmail.com> 2007-11-29 14:38:07 +00:00
NetworkManagerAP.c 2008-03-12 Dan Williams <dcbw@redhat.com> 2008-03-12 17:44:39 +00:00
NetworkManagerAP.h 2008-03-12 Dan Williams <dcbw@redhat.com> 2008-03-12 17:44:39 +00:00
NetworkManagerPolicy.c 2008-03-12 Dan Williams <dcbw@redhat.com> 2008-03-12 16:12:39 +00:00
NetworkManagerPolicy.h 2007-08-30 Dan Williams <dcbw@redhat.com> 2007-08-31 02:01:44 +00:00
NetworkManagerSystem.c 2008-03-11 Dan Williams <dcbw@redhat.com> 2008-03-11 22:21:25 +00:00
NetworkManagerSystem.h 2008-03-11 Dan Williams <dcbw@redhat.com> 2008-03-11 22:21:25 +00:00
NetworkManagerUtils.c 2007-11-15 Dan Williams <dcbw@redhat.com> 2007-11-15 20:33:08 +00:00
NetworkManagerUtils.h 2007-10-09 Tambet Ingo <tambet@gmail.com> 2007-10-09 08:57:35 +00:00
nm-activation-request.c 2007-11-15 Dan Williams <dcbw@redhat.com> 2007-11-15 16:57:33 +00:00
nm-activation-request.h 2007-10-21 Dan Williams <dcbw@redhat.com> 2007-10-22 01:51:41 +00:00
nm-call-store.c 2007-03-02 Tambet Ingo <tambet@ximian.com> 2007-03-02 09:30:48 +00:00
nm-call-store.h 2007-02-05 Tambet Ingo <tambet@ximian.com> 2007-02-05 12:14:09 +00:00
nm-cdma-device.c 2008-03-10 Dan Williams <dcbw@redhat.com> 2008-03-10 21:19:45 +00:00
nm-cdma-device.h 2008-01-21 Dan Williams <dcbw@redhat.com> 2008-01-21 19:14:18 +00:00
nm-crash-logger.c 2006-02-26 Dan Williams <dcbw@redhat.com> 2006-02-27 04:31:52 +00:00
nm-dbus-manager.c 2007-10-10 Tambet Ingo <tambet@gmail.com> 2007-10-10 14:36:31 +00:00
nm-dbus-manager.h 2007-11-27 Dan Williams <dcbw@redhat.com> 2007-11-27 17:18:41 +00:00
nm-device-802-3-ethernet.c Autoconnect PPPoE too 2008-03-12 18:30:01 +00:00
nm-device-802-3-ethernet.h 2008-03-12 Dan Williams <dcbw@redhat.com> 2008-03-12 16:12:39 +00:00
nm-device-802-11-wireless.c 2008-03-12 Dan Williams <dcbw@redhat.com> 2008-03-13 03:11:02 +00:00
nm-device-802-11-wireless.h 2008-02-29 Dan Williams <dcbw@redhat.com> 2008-02-29 16:33:59 +00:00
nm-device-interface.c 2008-03-12 Dan Williams <dcbw@redhat.com> 2008-03-12 18:31:00 +00:00
nm-device-interface.h 2008-03-12 Dan Williams <dcbw@redhat.com> 2008-03-12 16:12:39 +00:00
nm-device-private.h 2007-12-06 Tambet Ingo <tambet@gmail.com> 2007-12-06 14:51:43 +00:00
nm-device.c 2008-03-12 Dan Williams <dcbw@redhat.com> 2008-03-13 03:52:50 +00:00
nm-device.h 2008-03-12 Dan Williams <dcbw@redhat.com> 2008-03-12 16:12:39 +00:00
nm-gsm-device.c 2008-03-10 Dan Williams <dcbw@redhat.com> 2008-03-10 21:19:45 +00:00
nm-gsm-device.h 2008-01-02 Tambet Ingo <tambet@gmail.com> 2008-01-02 13:42:52 +00:00
nm-hal-manager.c 2008-03-11 Tambet Ingo <tambet@gmail.com> 2008-03-11 17:36:28 +00:00
nm-hal-manager.h 2007-09-12 Tambet Ingo <tambet@gmail.com> 2007-09-12 16:23:53 +00:00
nm-ip4-config.c 2008-03-10 Dan Williams <dcbw@redhat.com> 2008-03-10 13:08:37 +00:00
nm-ip4-config.h 2008-03-09 Dan Williams <dcbw@redhat.com> 2008-03-09 05:11:22 +00:00
nm-logging.c 2007-09-12 Tambet Ingo <tambet@gmail.com> 2007-09-12 16:23:53 +00:00
nm-logging.h 2007-02-19 Tambet Ingo <tambet@ximian.com> 2007-02-19 13:09:32 +00:00
nm-manager.c 2008-03-07 Dan Williams <dcbw@redhat.com> 2008-03-07 23:17:48 +00:00
nm-manager.h 2008-03-07 Dan Williams <dcbw@redhat.com> 2008-03-07 23:17:48 +00:00
nm-netlink-monitor.c 2007-12-18 Dan Williams <dcbw@redhat.com> 2007-12-18 17:12:21 +00:00
nm-netlink-monitor.h 2007-12-18 Dan Williams <dcbw@redhat.com> 2007-12-18 17:12:21 +00:00
nm-netlink.c 2008-03-07 Dan Williams <dcbw@redhat.com> 2008-03-07 17:09:44 +00:00
nm-netlink.h nm-netlink.h needs asm/types.h 2007-12-07 14:27:32 +00:00
nm-properties-changed-signal.c 2008-03-12 Dan Williams <dcbw@redhat.com> 2008-03-12 17:01:24 +00:00
nm-properties-changed-signal.h 2007-10-12 Tambet Ingo <tambet@gmail.com> 2007-10-12 10:11:15 +00:00
nm-serial-device.c Implement PPPoE. 2008-03-11 16:37:41 +00:00
nm-serial-device.h 2008-01-02 Tambet Ingo <tambet@gmail.com> 2008-01-02 13:42:52 +00:00
wpa.c 2006-08-04 Robert Love <rml@novell.com> 2006-08-04 15:46:06 +00:00
wpa.h 2005-12-14 Dan Williams <dcbw@redhat.com> 2005-12-14 20:48:08 +00:00