diff options
author | Markku Luukkainen <markku.luukkainen@digia.com> | 2009-06-05 09:21:16 (GMT) |
---|---|---|
committer | Markku Luukkainen <markku.luukkainen@digia.com> | 2009-06-05 09:21:16 (GMT) |
commit | a21a23c4f5d9d244f45568020e499b6084a7d9fe (patch) | |
tree | 3f943a3cb4dc370a57d24e481226c02c6dc7bd62 /doc/src/snippets/code/src_sql_kernel_qsqlindex.cpp | |
parent | c5845e6ea9cafea836038e24e6072aaed8242ef1 (diff) | |
parent | 4e7ab98ebd48cc1d5fa7643290e34ee166b9ab03 (diff) | |
download | Qt-a21a23c4f5d9d244f45568020e499b6084a7d9fe.zip Qt-a21a23c4f5d9d244f45568020e499b6084a7d9fe.tar.gz Qt-a21a23c4f5d9d244f45568020e499b6084a7d9fe.tar.bz2 |
Merge branch 'softkeys' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into softkeys
Conflicts:
src/gui/kernel/qapplication_s60.cpp
Diffstat (limited to 'doc/src/snippets/code/src_sql_kernel_qsqlindex.cpp')
0 files changed, 0 insertions, 0 deletions