[gjs: 2/2] Merge branch 'wip/verdre/get-string-inside-resolve_impl' into 'master'

[Philip Chimento <pchimento src gnome org>]

commit 1a7b11e4474d615314a97146947db79833803b99
Merge: 4ba1c19d 6aec0972
Author: Philip Chimento <philip chimento gmail com>
Date:   Tue Oct 27 03:56:11 2020 +0000

    Merge branch 'wip/verdre/get-string-inside-resolve_impl' into 'master'
    
    gi/wrapperutils: Move gjs_get_string_id() into resolve() implementations
    
    See merge request GNOME/gjs!513

 gi/boxed.cpp       | 13 ++++++++++---
 gi/boxed.h         |  2 +-
 gi/fundamental.cpp | 15 +++++++++++----
 gi/fundamental.h   |  2 +-
 gi/interface.cpp   | 13 ++++++++++---
 gi/interface.h     |  2 +-
 gi/object.cpp      | 13 ++++++++++---
 gi/object.h        |  2 +-
 gi/union.cpp       | 13 ++++++++++---
 gi/union.h         |  2 +-
 gi/wrapperutils.h  | 13 +------------
 11 files changed, 57 insertions(+), 33 deletions(-)
---