diff options
| author | Liang Qi <liang.qi@nokia.com> | 2011-07-14 11:15:55 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@nokia.com> | 2011-07-14 11:15:55 +0200 |
| commit | 88d6bf04e01f4f006ed2708851e925d59012d591 (patch) | |
| tree | 0fbd062191d966b7d2d1cc59dcafb9631e02b71f /doc/src/snippets/code/doc_src_qalgorithms.cpp | |
| parent | 80b91ac5f579b5cc310366fb0ea4aa4c813c04bf (diff) | |
| parent | 6827ea5e97c9f6540f0fae5236f89343c32f4cb8 (diff) | |
| download | qt4-tools-88d6bf04e01f4f006ed2708851e925d59012d591.tar.gz | |
Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7
Conflicts:
src/s60installs/bwins/QtGuiu.def
src/s60installs/eabi/QtGuiu.def
Diffstat (limited to 'doc/src/snippets/code/doc_src_qalgorithms.cpp')
0 files changed, 0 insertions, 0 deletions