[network-manager-openvpn: 27/27] properties: merge branch 'th/export-bgo764132'
- From: Thomas Haller <thaller src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [network-manager-openvpn: 27/27] properties: merge branch 'th/export-bgo764132'
- Date: Tue, 29 Mar 2016 11:33:34 +0000 (UTC)
commit 4f9ab03596b5559ab6f428ecdec864945c202570
Merge: 04bc2c5 af3e00e
Author: Thomas Haller <thaller redhat com>
Date: Tue Mar 29 13:29:58 2016 +0200
properties: merge branch 'th/export-bgo764132'
https://bugzilla.gnome.org/show_bug.cgi?id=764132
po/POTFILES.in | 1 +
properties/import-export.c | 743 ++++++++++++++++++++++---------------------
shared/Makefile.am | 2 +
shared/nm-glib.h | 7 +
shared/nm-macros-internal.h | 133 ++++++++-
shared/nm-shared-utils.c | 228 +++++++++++++
shared/nm-shared-utils.h | 63 ++++
shared/nm-test-utils.h | 113 ++++++--
shared/utils.c | 75 -----
shared/utils.h | 50 +++-
10 files changed, 944 insertions(+), 471 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]