diff options
| author | Michael Biebl <biebl@debian.org> | 2016-03-01 16:56:10 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2016-03-01 16:56:10 +0100 |
| commit | e62b307a9dd108e664aa507355ed3dd15a9c6d67 (patch) | |
| tree | 2957d1a0dde11be8bd9f506f8b075d21b85da2d0 /libnm/nm-manager.c | |
| parent | de39787fedbff438bd933c30675fc5c026db6aa0 (diff) | |
| parent | c2de0d98ba39e0a1a970d066fd19be786092f376 (diff) | |
Merge tag 'upstream/1.1.91'
Upstream version 1.1.91
Diffstat (limited to 'libnm/nm-manager.c')
| -rw-r--r-- | libnm/nm-manager.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/libnm/nm-manager.c b/libnm/nm-manager.c index b4b7e0c7..17a51f24 100644 --- a/libnm/nm-manager.c +++ b/libnm/nm-manager.c @@ -19,13 +19,13 @@ * Copyright 2007 - 2014 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" + +#include "nm-manager.h" #include <string.h> -#include <nm-utils.h> -#include "nm-default.h" -#include "nm-manager.h" +#include "nm-utils.h" #include "nm-device-ethernet.h" #include "nm-device-wifi.h" #include "nm-device-private.h" @@ -35,7 +35,6 @@ #include "nm-vpn-connection.h" #include "nm-object-cache.h" #include "nm-dbus-helpers.h" -#include "nm-macros-internal.h" #include "nmdbus-manager.h" |