diff options
| author | Thomas Haller <thaller@redhat.com> | 2015-08-05 15:37:52 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2015-08-05 15:37:52 +0200 |
| commit | 796ec5c038abd07a0fecd52794bb9ec4e6b3d11d (patch) | |
| tree | c5ea5b9dae4e7093545eb6e3e0ffa042578a6817 /src/devices/adsl/nm-device-adsl.h | |
| parent | e0bded93f347154fdd5e2a5c2811ff49942f24d5 (diff) | |
| parent | 22e1a97e122b9c563a4da76bfdb2bd3e77dddccf (diff) | |
| download | NetworkManager-796ec5c038abd07a0fecd52794bb9ec4e6b3d11d.tar.gz | |
all: merge branch 'th/nm-default-bgo752857'
- order destruction of singletons
- add new header "nm-default.h" to always include a set of standard
headers.
https://bugzilla.gnome.org/show_bug.cgi?id=752857
Diffstat (limited to 'src/devices/adsl/nm-device-adsl.h')
| -rw-r--r-- | src/devices/adsl/nm-device-adsl.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/devices/adsl/nm-device-adsl.h b/src/devices/adsl/nm-device-adsl.h index 74e29d5dd1..3587bfc75f 100644 --- a/src/devices/adsl/nm-device-adsl.h +++ b/src/devices/adsl/nm-device-adsl.h @@ -23,7 +23,7 @@ #define __NETWORKMANAGER_DEVICE_ADSL_H__ // Parent class -#include "nm-glib.h" +#include "nm-default.h" #include "nm-device.h" G_BEGIN_DECLS |