[gobject-introspection: 2/2] Merge branch 'preserve-complete-ctype' into 'master'

[Emmanuele Bassi <ebassi src gnome org>]

commit 6ada03c8ad2a12ecff6448bb26c3ece3afe433c0
Merge: 31ab9496 4bfdc83b
Author: Emmanuele Bassi <ebassi gmail com>
Date:   Fri Feb 9 14:03:48 2018 +0000

    Merge branch 'preserve-complete-ctype' into 'master'
    
    Preserve complete_ctype when using type from annotation.
    
    Closes #190
    
    See merge request GNOME/gobject-introspection!5

 giscanner/maintransformer.py                                          | 1 +
 .../Regress-1.0-C-expected/Regress.annotation_set_source_file.page    | 4 ++--
 tests/scanner/Regress-1.0-expected.gir                                | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)
---