diff options
| author | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-10-26 12:00:43 (GMT) |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-10-26 12:00:43 (GMT) |
| commit | 85f3f3ac74a2e7fe6a0874a46f9358a15f0dab34 (patch) | |
| tree | 191b227596f18333f1609ff824d2746dd7f1090f /tests/auto/declarative/qmlvisual/qdeclarativemousearea/data/mousearea-flickable.11.png | |
| parent | 26139fcacc05b4a74fce1ef4e0db819118765310 (diff) | |
| parent | 2d071521228a6bc9ef423cbdbbd8560d28208790 (diff) | |
| download | Qt-85f3f3ac74a2e7fe6a0874a46f9358a15f0dab34.zip Qt-85f3f3ac74a2e7fe6a0874a46f9358a15f0dab34.tar.gz Qt-85f3f3ac74a2e7fe6a0874a46f9358a15f0dab34.tar.bz2 | |
Merge remote branch 'qt/master' into lighthouse-master
Conflicts:
src/opengl/qwindowsurface_gl.cpp
Diffstat (limited to 'tests/auto/declarative/qmlvisual/qdeclarativemousearea/data/mousearea-flickable.11.png')
| -rw-r--r-- | tests/auto/declarative/qmlvisual/qdeclarativemousearea/data/mousearea-flickable.11.png | bin | 1705 -> 1705 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativemousearea/data/mousearea-flickable.11.png b/tests/auto/declarative/qmlvisual/qdeclarativemousearea/data/mousearea-flickable.11.png Binary files differindex ccb9fdd..8fd0a97 100644 --- a/tests/auto/declarative/qmlvisual/qdeclarativemousearea/data/mousearea-flickable.11.png +++ b/tests/auto/declarative/qmlvisual/qdeclarativemousearea/data/mousearea-flickable.11.png |
