[babl: 6/6] Merge branch 'jvesely/babl-master'

From: Øyvind "pippin" Kolås <ok src gnome org>
To: commits-list gnome org
Cc:
Subject: [babl: 6/6] Merge branch 'jvesely/babl-master'
Date: Thu, 6 Dec 2018 21:14:19 +0000 (UTC)

commit f9d111e3f5b58377b3ec2f64e00aef41f3c0bc29
Merge: 231c40c 6959fb1
Author: Øyvind Kolås <pippin gimp org>
Date:   Thu Dec 6 22:12:09 2018 +0100

    Merge branch 'jvesely/babl-master'

 .gitlab-ci.yml        | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++
 babl/base/meson.build |  1 +
 babl/meson.build      |  2 +-
 meson.build           | 15 ++++++++-----
 meson_options.txt     |  1 +
 5 files changed, 73 insertions(+), 7 deletions(-)
---

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