diff options
| author | Bea Lam <bea.lam@nokia.com> | 2010-05-19 17:10:14 +1000 |
|---|---|---|
| committer | Bea Lam <bea.lam@nokia.com> | 2010-05-19 17:10:14 +1000 |
| commit | d395903e4d061a30117f7b925bdad41771a29067 (patch) | |
| tree | e7e2e2d09afc77af51197f5d4954249b21ee9a44 /.gitignore | |
| parent | 8238ef5d6648ca8fde2c709d6125772cac6a11a5 (diff) | |
| parent | f5588a2177452de29804e67ae8cd45c50f6dfdba (diff) | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Conflicts:
doc/src/snippets/declarative/listview/highlight.qml
doc/src/snippets/declarative/listview/listview.qml
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions