Merge tag 'upstream/1.5.90' into experimental

Upstream version 1.5.90

1 files changed, 0 insertions, 26 deletions

diff --git a/libnm/nm-device-private.h b/libnm/nm-device-private.h
index 66fc6b6b..e69de29b 100644
--- a/libnm/nm-device-private.h
+++ b/libnm/nm-device-private.h
@@ -1,26 +0,0 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-/*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301 USA.
- *
- * Copyright 2007 - 2012 Red Hat, Inc.
- */
-
-#ifndef __NM_DEVICE_PRIVATE_H__
-#define __NM_DEVICE_PRIVATE_H__
-
-void _nm_device_set_device_type (NMDevice *device, NMDeviceType dtype);
-
-#endif /* __NM_DEVICE_PRIVATE_H__ */