diff options
| author | Jerome Pasion <jerome.pasion@nokia.com> | 2011-01-05 10:41:57 (GMT) |
|---|---|---|
| committer | Jerome Pasion <jerome.pasion@nokia.com> | 2011-01-05 10:41:57 (GMT) |
| commit | 55d05512939b8e7a43f22a1cc423112d8fb3d2eb (patch) | |
| tree | 5cb44bd6883fe8da180378fe7416d5b1514f6578 /doc/src/declarative/anchor-layout.qdoc | |
| parent | 9b0ad342cc888bd4291c84f63fe485bfbfdc3ce0 (diff) | |
| parent | f44f7084a3020ed8e249644d5b5e07f74cb7b070 (diff) | |
| download | Qt-55d05512939b8e7a43f22a1cc423112d8fb3d2eb.zip Qt-55d05512939b8e7a43f22a1cc423112d8fb3d2eb.tar.gz Qt-55d05512939b8e7a43f22a1cc423112d8fb3d2eb.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
Merging qt-doc-team into cloned repository
Diffstat (limited to 'doc/src/declarative/anchor-layout.qdoc')
| -rw-r--r-- | doc/src/declarative/anchor-layout.qdoc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/doc/src/declarative/anchor-layout.qdoc b/doc/src/declarative/anchor-layout.qdoc index 11acbad..70381de 100644 --- a/doc/src/declarative/anchor-layout.qdoc +++ b/doc/src/declarative/anchor-layout.qdoc @@ -28,10 +28,14 @@ /*! \page qml-anchor-layout.html \target anchor-layout +<<<<<<< HEAD \contentspage QML Features \previouspage {Using QML Positioner and Repeater Items}{Component Layouts} \nextpage {QML Mouse Events}{Mouse Events} \title Anchor-based Layout in QML +======= +\title Anchor-Based Layout in QML +>>>>>>> f44f7084a3020ed8e249644d5b5e07f74cb7b070 \section1 Overview |