NetworkManager r3131 - in trunk: . src/ppp-manager system-settings/plugins/ifcfg system-settings/src

[dcbw svn gnome org]

Author: dcbw
Date: 2007-12-04 16:17:57 +0000 (Tue, 04 Dec 2007)
New Revision: 3131
ViewCVS link: http://svn.gnome.org/viewcvs/NetworkManager?rev=3131&view=rev

Modified:
   trunk/ChangeLog
   trunk/src/ppp-manager/Makefile.am
   trunk/src/ppp-manager/nm-ppp-manager.c
   trunk/system-settings/plugins/ifcfg/Makefile.am
   trunk/system-settings/src/Makefile.am
   trunk/system-settings/src/main.c
Log:
2007-12-04  Dan Williams  <dcbw redhat com>

	Patch from Michael Biebl <biebl debian org>

	* system-settings/plugins/ifcfg/Makefile.am
	  system-settings/src/main.c
	  system-settings/src/Makefile.am
		- Put system settings plugins in NM plugins dir

	* src/ppp-manager/Makefile.am
	  src/ppp-manager/nm-ppp-manager.c
		- Move pppd plugin to NM plugins dir