diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-04-30 05:00:08 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-04-30 05:00:08 (GMT) |
| commit | 27b180804d506a734318edc7a6062d7fdd9dca6d (patch) | |
| tree | 85ec4099faec108b33db4e473db3cd9ca37d4960 /doc/src/qalgorithms.qdoc | |
| parent | f2fb6b63c6e5572d02245c64da652f13174588b9 (diff) | |
| parent | 7e95bf13d72b28c87dab4b346fd96de6e8a4c046 (diff) | |
| download | Qt-27b180804d506a734318edc7a6062d7fdd9dca6d.zip Qt-27b180804d506a734318edc7a6062d7fdd9dca6d.tar.gz Qt-27b180804d506a734318edc7a6062d7fdd9dca6d.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Conflicts:
examples/declarative/follow/pong.qml
examples/declarative/listview/dummydata/MyPetsModel.qml
Diffstat (limited to 'doc/src/qalgorithms.qdoc')
0 files changed, 0 insertions, 0 deletions