[json-glib: 14/14] Merge branch 'wip/ordered-iter' into 'master'
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [json-glib: 14/14] Merge branch 'wip/ordered-iter' into 'master'
- Date: Mon, 24 Aug 2020 16:55:19 +0000 (UTC)
commit 7858887ba699bad68c9860562451e95ffdb0f4f0
Merge: 1bfdc65 55f4392
Author: Emmanuele Bassi <ebassi gmail com>
Date: Mon Aug 24 16:55:18 2020 +0000
Merge branch 'wip/ordered-iter' into 'master'
Bug squashing
Closes #46, #45, and #41
See merge request GNOME/json-glib!30
doc/json-glib-sections.txt | 2 +
json-glib/json-generator.c | 14 +++--
json-glib/json-glib-format.c | 17 +++++-
json-glib/json-gobject.c | 51 ++++++++---------
json-glib/json-object.c | 121 ++++++++++++++++++++++++++++++++++++++++-
json-glib/json-parser.c | 27 ++++-----
json-glib/json-types-private.h | 14 +++++
json-glib/json-types.h | 8 +++
json-glib/json-utils.c | 4 +-
json-glib/meson.build | 2 +-
json-glib/tests/generator.c | 11 ++--
json-glib/tests/invalid.c | 1 +
json-glib/tests/object.c | 58 +++++++++++++++++---
meson.build | 19 +++----
14 files changed, 269 insertions(+), 80 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]