[cogl/cogl-1.22] (2 commits) ...Merge branch 'cogl-1.22' into 'cogl-1.22'

From: Emmanuele Bassi <ebassi src gnome org>
To: commits-list gnome org
Cc:
Subject: [cogl/cogl-1.22] (2 commits) ...Merge branch 'cogl-1.22' into 'cogl-1.22'
Date: Mon, 18 Mar 2019 01:22:48 +0000 (UTC)

Summary of changes:

  fdc8de9... primitive: Fix syntax on annotations type
  df47776... Merge branch 'cogl-1.22' into 'cogl-1.22'