Ooops, fix order after conflict

git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@1189 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams 2005-12-14 17:57:08 +00:00
parent a00992c902
commit 1da42ec835

View file

@ -1,16 +1,3 @@
2005-12-14 Robert Love <rml@novell.com>
Patch from Stefan Scheler <sscheler@suse.de>:
* 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 <dcbw@redhat.com>
* 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 <rml@novell.com>
Patch from Stefan Scheler <sscheler@suse.de>:
* 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 <dcbw@redhat.com>
* src/nm-ap-security*.[ch]