From 1da42ec8355692be864bf0f5721b145de1e679a6 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Wed, 14 Dec 2005 17:57:08 +0000 Subject: [PATCH] Ooops, fix order after conflict git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@1189 4912f4e0-d625-0410-9fb7-b9a5a253dbdc --- ChangeLog | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index e9779d9a44..ba7f90cc7b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,16 +1,3 @@ -2005-12-14 Robert Love - - Patch from Stefan Scheler : - * src/NetworkManagerDevice.c: call backend code to activate and - deactivate NIS. - * src/NetworkManagerSystem.h: add new NIS interfaces. - * src/backends/NetworkManagerDebian.c, - src/backends/NetworkManagerGentoo.c, - src/backends/NetworkManagerRedHat.c, - src/backends/NetworkManagerSlackware.c: add stub functions for NIS - support. - * src/backends/NetworkManagerSuSE.c: add NIS support, baby. - 2005-12-14 Dan Williams * include/NetworkManager.h @@ -29,6 +16,19 @@ - (nm_802_11_wireless_discover_capabilities): Check extended 802.11 wireless-specific capabilities of the driver +2005-12-14 Robert Love + + Patch from Stefan Scheler : + * src/NetworkManagerDevice.c: call backend code to activate and + deactivate NIS. + * src/NetworkManagerSystem.h: add new NIS interfaces. + * src/backends/NetworkManagerDebian.c, + src/backends/NetworkManagerGentoo.c, + src/backends/NetworkManagerRedHat.c, + src/backends/NetworkManagerSlackware.c: add stub functions for NIS + support. + * src/backends/NetworkManagerSuSE.c: add NIS support, baby. + 2005-12-14 Dan Williams * src/nm-ap-security*.[ch]