diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-05-05 01:19:22 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-05-05 01:19:22 (GMT) |
| commit | 84b619c1e8556c3e7ca79d799dfa705b63523370 (patch) | |
| tree | 0fe7ef43492944f44bdb670aa774bcb4d78e5450 /.gitignore | |
| parent | c7a0cae7deb6e31c5b2e82c9a63ebe0a167fed09 (diff) | |
| parent | c376633cba5c79ed1d842d9c6b7b68e31c646959 (diff) | |
| download | Qt-84b619c1e8556c3e7ca79d799dfa705b63523370.zip Qt-84b619c1e8556c3e7ca79d799dfa705b63523370.tar.gz Qt-84b619c1e8556c3e7ca79d799dfa705b63523370.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Conflicts:
src/declarative/qml/qmldom.cpp
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions