summaryrefslogtreecommitdiff
path: root/doc/src/snippets/code
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-09-16 07:55:52 +1000
committerQt Continuous Integration System <qt-info@nokia.com>2011-09-16 07:55:52 +1000
commit9fb4bcada38c9d7b71f956342627bbc0f90cc06a (patch)
treed1ba2b79376b5ae4de0c6de37ca2500f42c09502 /doc/src/snippets/code
parenta3dfda2855814d72aa6b5fdf566ee18f0ad9ddb1 (diff)
parent9b2ef45e8109dcdfce16c6c41ae38476f8aac8df (diff)
downloadqt4-tools-9fb4bcada38c9d7b71f956342627bbc0f90cc06a.tar.gz
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Update changes file. wtf? .pro.user files? congrats to overriding the hook! Fix QNetworkReply::errorString returning an untranslated string runonphone: Add a missing argument for QString::arg
Diffstat (limited to 'doc/src/snippets/code')
0 files changed, 0 insertions, 0 deletions