[gtranslator/gtk4: 17/52] Merge branch 'gtk4' into 'gtk4' : resolved merge conflicts




commit eb1be99e3909d9313826ef6ed75cd9cfb06dd980
Merge: 519a57ff 24a0bedb
Author: redoC-A2k <afshanahmeda2k gmail com>
Date:   Sat Jun 11 06:00:41 2022 +0000

    Merge branch 'gtk4' into 'gtk4' : resolved merge conflicts
    
    # Conflicts:
    #   src/gtr-utils.c

 .gitlab-ci.yml              |  16 +++++++
 scripts/check-diff-style.sh |   7 +++
 src/gtr-header.c            |  27 +----------
 src/gtr-io-error-info-bar.c | 109 +++++++++++++++++++++++++++++++-------------
 src/gtr-io-error-info-bar.h |  12 +++--
 src/gtr-po.c                |  52 +++++++++++++++++++++
 src/gtr-po.h                |   4 ++
 src/gtr-profile-manager.c   |   1 -
 src/gtr-tab.c               |  92 +++++++++++++++++++++++++++++++++----
 src/gtr-utils.c             |  46 +++++++++++++++++++
 src/gtr-utils.h             |   2 +
 11 files changed, 299 insertions(+), 69 deletions(-)
---


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]