[gtk: 8/8] Merge branch 'wip/otte/for-master' into 'master'
- From: Benjamin Otte <otte src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk: 8/8] Merge branch 'wip/otte/for-master' into 'master'
- Date: Mon, 18 Oct 2021 13:32:04 +0000 (UTC)
commit 886f435fc81464d5a8ae9a6407fe83250a879356
Merge: cf7ee82755 a859471960
Author: Benjamin Otte <otte benjamin googlemail com>
Date: Mon Oct 18 13:32:02 2021 +0000
Merge branch 'wip/otte/for-master' into 'master'
glcontext: reinstate another missing "!"
See merge request GNOME/gtk!4070
gdk/broadway/gdkbroadway-server.c | 57 +++++---------
gdk/gdkcontentserializer.c | 6 +-
gdk/gdkglcontext.c | 2 +-
gdk/gdkgltexture.c | 5 +-
gdk/gdkmemoryformat.c | 12 +--
gdk/gdkmemoryformatprivate.h | 7 ++
gdk/gdkpixbuf-drawable.c | 34 ++++++---
gdk/loaders/gdkjpeg.c | 51 +++----------
gdk/loaders/gdktiff.c | 153 +++++++++++++++-----------------------
testsuite/gdk/memorytexture.c | 3 +-
testsuite/gdk/texture-threads.c | 11 ++-
11 files changed, 145 insertions(+), 196 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]