about summary refs log tree commit diff
path: root/src/settings/nm-agent-manager.c
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2016-08-03 23:00:16 +0200
committerMichael Biebl <biebl@debian.org>2016-08-03 23:00:16 +0200
commit511e94811644318cc196e197616fdc558030e8e3 (patch)
tree1ea5c895be190982cc686d43ebed62ae33d60426 /src/settings/nm-agent-manager.c
parentfb15332b981b5637ae4aeadc546e2f46bf333cd1 (diff)
parentd6201f5d8daada3d64a0a3e0038e14eebec683ce (diff)
Merge tag 'upstream/1.2.4'
Upstream version 1.2.4
Diffstat (limited to 'src/settings/nm-agent-manager.c')
-rw-r--r--src/settings/nm-agent-manager.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/settings/nm-agent-manager.c b/src/settings/nm-agent-manager.c
index 48a7da7b..54ca2f55 100644
--- a/src/settings/nm-agent-manager.c
+++ b/src/settings/nm-agent-manager.c
@@ -20,11 +20,13 @@
 
 #include "nm-default.h"
 
+#include "nm-agent-manager.h"
+
 #include <string.h>
 #include <pwd.h>
 
+#include "nm-common-macros.h"
 #include "nm-dbus-interface.h"
-#include "nm-agent-manager.h"
 #include "nm-secret-agent.h"
 #include "nm-auth-utils.h"
 #include "nm-setting-vpn.h"