diff options
| author | Ian Walters <ian.walters@nokia.com> | 2009-05-05 02:11:36 (GMT) |
|---|---|---|
| committer | Ian Walters <ian.walters@nokia.com> | 2009-05-05 02:11:36 (GMT) |
| commit | d0b37af9b27849278fd56a83635c141525a912ce (patch) | |
| tree | 2c0c2c149d686b52c339a5b2135fde35659d7648 /.gitignore | |
| parent | 28b3eb37f7647450ccbac1365a06ffc6ba6a8584 (diff) | |
| parent | 84b619c1e8556c3e7ca79d799dfa705b63523370 (diff) | |
| download | Qt-d0b37af9b27849278fd56a83635c141525a912ce.zip Qt-d0b37af9b27849278fd56a83635c141525a912ce.tar.gz Qt-d0b37af9b27849278fd56a83635c141525a912ce.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Conflicts:
doc/src/tutorials/declarative.qdoc
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions