[gjs: 9/9] Merge branch 'april-maintenance' into 'master'
- From: Cosimo Cecchi <cosimoc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gjs: 9/9] Merge branch 'april-maintenance' into 'master'
- Date: Sat, 12 May 2018 17:40:30 +0000 (UTC)
commit e891a02a64504a57b14c3d2cbe158be2031f5293
Merge: a662ed09 28d8b5d2
Author: Cosimo Cecchi <cosimo cecchi gmail com>
Date: Sat May 12 17:39:07 2018 +0000
Merge branch 'april-maintenance' into 'master'
April maintenance
See merge request GNOME/gjs!141
gi/arg.cpp | 6 +-
gi/boxed.cpp | 87 +++++++--------
gi/function.cpp | 2 +-
gi/fundamental.cpp | 16 +--
gi/interface.cpp | 12 +--
gi/ns.cpp | 16 +--
gi/object.cpp | 86 +++++++--------
gi/param.cpp | 13 ++-
gi/repo.cpp | 16 +--
gi/union.cpp | 20 ++--
gi/value.cpp | 106 ++++++------------
gjs/console.cpp | 9 ++
gjs/context.cpp | 13 +++
gjs/context.h | 3 +
gjs/importer.cpp | 167 +++++++++++------------------
gjs/jsapi-util-string.cpp | 133 +++++++++++++++++++++++
gjs/jsapi-util.cpp | 34 +-----
gjs/jsapi-util.h | 7 +-
gjs/mem.cpp | 14 +--
gjs/mem.h | 7 +-
gjs/module.cpp | 7 +-
installed-tests/scripts/testCommandLine.sh | 26 ++---
22 files changed, 409 insertions(+), 391 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]