diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-04-28 05:05:53 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-04-28 05:05:53 (GMT) |
| commit | 2b8abf28d10a6d064fe116892161289be5ffb391 (patch) | |
| tree | 6a1123766682c82bddbdf358316f26e11f6976c7 /src/declarative/qml/parser | |
| parent | d7ffaa8ccbf881d25004b9a710259701d1a8c9bc (diff) | |
| parent | a6ffd7c7c28066f2794579bc40e7b9517e76d1ff (diff) | |
| download | Qt-2b8abf28d10a6d064fe116892161289be5ffb391.zip Qt-2b8abf28d10a6d064fe116892161289be5ffb391.tar.gz Qt-2b8abf28d10a6d064fe116892161289be5ffb391.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of ../kinetic into kinetic-declarativeui-qfx
Conflicts:
examples/declarative/mouseregion/mouse.qml
Diffstat (limited to 'src/declarative/qml/parser')
0 files changed, 0 insertions, 0 deletions