Skip to content
GitLab
Commit cedd3425 authored by Michael Brasser's avatar Michael Brasser Committed by The Qt Project
Browse files

Fix incorrect merge in textureprovider example. 


Change-Id: I5a76ab1ef77c43aecd2a03cc7d614a198290f427
Reviewed-by: default avatarChristian Stenger <christian.stenger@digia.com>
Reviewed-by: default avatarGunnar Sletta <gunnar.sletta@digia.com>
parent f9bf2fb4
Hide whitespace changes
Inline Side-by-side
Showing
with 0 additions and 1 deletion
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment