[cogl: 2/2] Merge branch 'wip/smcv/test-premult-use-after-free-1.22' into 'cogl-1.22'

[Emmanuele Bassi <ebassi src gnome org>]

commit d205b8b73dc772f9da76a879107a9164de24618b
Merge: 95342464 0f5f3179
Author: Emmanuele Bassi <ebassi gmail com>
Date:   Mon Mar 9 16:16:17 2020 +0000

    Merge branch 'wip/smcv/test-premult-use-after-free-1.22' into 'cogl-1.22'
    
    [1.22] test-premult: Don't free texture data until CoglBitmap is freed
    
    See merge request GNOME/cogl!12

 tests/conform/test-conform-main.c | 2 +-
 tests/conform/test-premult.c      | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)
---