diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-01-10 18:41:43 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-01-10 18:41:43 +0100 |
| commit | cc0eb9c2aa9032c6a7bf2ab05d1eb913a09fa4f1 (patch) | |
| tree | 7314014389e227bd7c9b28d97eebcd072e4852a2 /examples/quick/views | |
| parent | cb2ac154273a8c07a1e4a14246ae22f6e0deaeda (diff) | |
| parent | 0a74dc69b4c57a15da90be29b598371dfa63f7ee (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/qml/jsruntime/qv4managed_p.h
Change-Id: I5da7ae9c87a539e42292f272d9e2b5faab619c9f
Diffstat (limited to 'examples/quick/views')
| -rw-r--r-- | examples/quick/views/listview/highlightranges.qml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/quick/views/listview/highlightranges.qml b/examples/quick/views/listview/highlightranges.qml index 6c4190dada..8b4eed7400 100644 --- a/examples/quick/views/listview/highlightranges.qml +++ b/examples/quick/views/listview/highlightranges.qml @@ -89,7 +89,7 @@ Rectangle { // item visible. // // The second ListView sets a highlight range which attempts to keep the - // current item within the the bounds of the range. However, + // current item within the bounds of the range. However, // items will not scroll beyond the beginning or end of the view, // forcing the highlight to move outside the range at the ends. // |