projects / platform / upstream / qtdeclarative.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: f9bf2fb) | patch
Fix incorrect merge in textureprovider example.
authorMichael Brasser <michael.brasser@live.com>
Tue, 26 Mar 2013 19:53:38 +0000 (14:53 -0500)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Tue, 2 Apr 2013 14:42:44 +0000 (16:42 +0200)
commitcedd342523e986028b8b4799cd564cd9307ebe12
treefa6af8c609c1704af49716c070ad9efc06c906e7tree | snapshot
parentf9bf2fb4beebdee9ccfebc35579964c0d3b96dbdcommit | diff
Fix incorrect merge in textureprovider example.

Change-Id: I5a76ab1ef77c43aecd2a03cc7d614a198290f427
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
examples/quick/textureprovider/etcprovider.h diff | blob | history
Domain: UI Framework / Qt;