colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit 'origin/master' into polkit1

Browse Source 
Conflicts:
	libnm-glib/Makefile.am
	src/system-settings/nm-sysconfig-settings.c
	system-settings/plugins/ifcfg-rh/plugin.c
This commit is contained in:
Dan Williams
2009-08-21 14:12:31 -05:00
parent 650cbcc108 09459788cd
commit e2b13be3d9
75 changed files with 1145 additions and 4203 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
system-settings/plugins/ifcfg-suse/plugin.c
View File

@@ -23,9 +23,6 @@
*/
#include <config.h>
#include <gmodule.h>
#include <glib-object.h>
#include <glib/gi18n.h>
#include <string.h>
#include <sys/inotify.h>
#include <unistd.h>
@@ -33,11 +30,10 @@
#include <sys/ioctl.h>
#include <sys/stat.h>
#ifndef NO_GIO
#include <gmodule.h>
#include <glib-object.h>
#include <glib/gi18n.h>
#include <gio/gio.h>
#else
#include <gfilemonitor/gfilemonitor.h>
#endif
#include <nm-setting-connection.h>
#include <nm-setting-ip4-config.h>