diff options
| author | Bea Lam <bea.lam@nokia.com> | 2011-01-27 04:03:13 (GMT) |
|---|---|---|
| committer | Bea Lam <bea.lam@nokia.com> | 2011-01-27 04:03:13 (GMT) |
| commit | 05ba01a2519996a3dffaab2e498dc3d2a999dc45 (patch) | |
| tree | c478929354b59407bea92e885baf0eecb4e351c8 /examples | |
| parent | f15778e60ba538b8715f6433a472ffe08a21d934 (diff) | |
| parent | 5c91e32a6238fd112a7282443214c8686cda51de (diff) | |
| download | Qt-05ba01a2519996a3dffaab2e498dc3d2a999dc45.zip Qt-05ba01a2519996a3dffaab2e498dc3d2a999dc45.tar.gz Qt-05ba01a2519996a3dffaab2e498dc3d2a999dc45.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11
Conflicts:
src/declarative/graphicsitems/qdeclarativegridview.cpp
src/declarative/graphicsitems/qdeclarativelistview.cpp
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/gestures/imagegestures/imagewidget.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/examples/gestures/imagegestures/imagewidget.cpp b/examples/gestures/imagegestures/imagewidget.cpp index 12e6216..8bbb965 100644 --- a/examples/gestures/imagegestures/imagewidget.cpp +++ b/examples/gestures/imagegestures/imagewidget.cpp @@ -1,3 +1,4 @@ + /**************************************************************************** ** ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). |