diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2009-07-14 04:26:32 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2009-07-14 04:26:32 (GMT) |
| commit | 799380ea82ced8cc5eb4eed5b1306748125331fa (patch) | |
| tree | 41140bd1687211ae305f7b0e0f1cd2d413db3c94 /examples/declarative | |
| parent | a093c5ef65aa2c28f52f78c8be5bbe7d567646fa (diff) | |
| parent | 59b3e3ba52891197510115f912e7934ac1784d7c (diff) | |
| download | Qt-799380ea82ced8cc5eb4eed5b1306748125331fa.zip Qt-799380ea82ced8cc5eb4eed5b1306748125331fa.tar.gz Qt-799380ea82ced8cc5eb4eed5b1306748125331fa.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Conflicts:
src/declarative/qml/parser/qmljsparser.cpp
Diffstat (limited to 'examples/declarative')
0 files changed, 0 insertions, 0 deletions