summaryrefslogtreecommitdiffstats
path: root/doc/src/files-and-resources
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-06-23 13:13:51 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-06-23 13:13:51 (GMT)
commit164728f711136356a6c3482f762321b01c9d82dd (patch)
treeef76a64523ff99b1160eb7c8885a0d84c810f735 /doc/src/files-and-resources
parentdfcaa6b67c1df879b08dd6952a7cfd60d93ff543 (diff)
parent59bd3bcd961fb3198dc9ba24996f7f9af67aeda3 (diff)
downloadQt-164728f711136356a6c3482f762321b01c9d82dd.zip
Qt-164728f711136356a6c3482f762321b01c9d82dd.tar.gz
Qt-164728f711136356a6c3482f762321b01c9d82dd.tar.bz2
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: Add a function that returns the D-Bus local machine ID Add an SSE4.2 even simpler version of toLatin1
Diffstat (limited to 'doc/src/files-and-resources')
0 files changed, 0 insertions, 0 deletions