diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2009-06-30 00:13:40 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2009-06-30 00:13:40 (GMT) |
| commit | b405bd2ee0a752ba943b5c9993bb0dccf9ddf2f1 (patch) | |
| tree | 149b6b4bba66e88a44822b1e2d17d699a08faa4d /demos/declarative/calculator/CalcButton.qml | |
| parent | bce256a8513292ff71e9cb690893cea974b642c9 (diff) | |
| parent | 6856dd2850245414fb610e651391f5fe141605de (diff) | |
| download | Qt-b405bd2ee0a752ba943b5c9993bb0dccf9ddf2f1.zip Qt-b405bd2ee0a752ba943b5c9993bb0dccf9ddf2f1.tar.gz Qt-b405bd2ee0a752ba943b5c9993bb0dccf9ddf2f1.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Conflicts:
demos/declarative/flickr/content/ImageDetails.qml
Diffstat (limited to 'demos/declarative/calculator/CalcButton.qml')
0 files changed, 0 insertions, 0 deletions