aboutsummaryrefslogtreecommitdiffstats
path: root/examples/quick/localstorage
diff options
context:
space:
mode:
authorMichael Brasser <michael.brasser@live.com>2013-03-26 14:53:38 -0500
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-04-02 16:42:44 +0200
commitcedd342523e986028b8b4799cd564cd9307ebe12 (patch)
treefa6af8c609c1704af49716c070ad9efc06c906e7 /examples/quick/localstorage
parentf9bf2fb4beebdee9ccfebc35579964c0d3b96dbd (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>
Diffstat (limited to 'examples/quick/localstorage')
0 files changed, 0 insertions, 0 deletions