config: merge branch 'th/nm-config-intern-bgo750558'

System Internals / NetworkManager - Thomas Haller [redhat.com] - 2 July 2015 09:04 UTC

05db3ee config: merge branch 'th/nm-config-intern-bgo750558'

configure.ac | 7 +
contrib/fedora/rpm/NetworkManager.conf | 20 +-
contrib/fedora/rpm/NetworkManager.spec | 25 +-
contrib/fedora/rpm/build.sh | 3 -
man/NetworkManager.conf.xml.in | 37 +-
src/Makefile.am | 1 +
src/devices/nm-device.c | 2 +-
src/main.c | 2 +-
src/nm-config-data.c | 232 +++++++++-
src/nm-config-data.h | 25 +-
src/nm-config.c | 799 +++++++++++++++++++++++++++++---
src/nm-config.h | 17 +-
src/settings/nm-settings.c | 141 +++---
src/tests/config/test-config.c | 376 ++++++++++++++-
14 files changed, 1501 insertions(+), 186 deletions(-)

Upstream: cgit.freedesktop.org

  • Share