[network-manager-applet/th/nm-1-4-merge: 14/14] all: merge branch 'master' into nm-1-4
- From: Thomas Haller <thaller src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [network-manager-applet/th/nm-1-4-merge: 14/14] all: merge branch 'master' into nm-1-4
- Date: Wed, 14 Sep 2016 13:45:27 +0000 (UTC)
commit 5199ea8b76a2d034f7e836ecd1a4a324db0b034c
Merge: 9722921 3095707
Author: Thomas Haller <thaller redhat com>
Date: Wed Sep 14 15:38:51 2016 +0200
all: merge branch 'master' into nm-1-4
Reset 'master' from 1.5.0 state back to 1.4.1.
For the moment, 'master' still works well with
1.3 API of NetworkManager and libnm. There is no
need for maintaining upstream two separate versions
of network-manager-applet that both target 1.3 API.
This means, for the moment there is no bug-fix-only
'nm-1-4' branch anymore. If you want such a stale
branch that receives only critical fixes, you have
to maintain it yourself.
po/ca.po | 1037 ++++++++++++++++++++++--------
po/es.po | 87 ++--
src/connection-editor/ce-page-general.ui | 2 +-
src/connection-editor/page-general.c | 17 +-
4 files changed, 819 insertions(+), 324 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]