diff options
| author | Bea Lam <bea.lam@nokia.com> | 2010-05-07 03:40:24 (GMT) |
|---|---|---|
| committer | Bea Lam <bea.lam@nokia.com> | 2010-05-07 03:40:24 (GMT) |
| commit | bc657dc60e8fe91543f0a75fb31418e3e553a256 (patch) | |
| tree | 2df82453d9b3b352a6e8bce9f140f0781c8bc628 /doc/src/snippets/code/src_script_qscriptable.cpp | |
| parent | 4600f2053802ad41550a84573bdcbe4b50fb5a67 (diff) | |
| parent | abd2c025d088064c31fd1b0e9c5ea29996e51bbe (diff) | |
| download | Qt-bc657dc60e8fe91543f0a75fb31418e3e553a256.zip Qt-bc657dc60e8fe91543f0a75fb31418e3e553a256.tar.gz Qt-bc657dc60e8fe91543f0a75fb31418e3e553a256.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Conflicts:
examples/declarative/dynamic/qml/PerspectiveItem.qml
Diffstat (limited to 'doc/src/snippets/code/src_script_qscriptable.cpp')
0 files changed, 0 insertions, 0 deletions