diff options
author | aavit <qt-info@nokia.com> | 2011-09-22 09:02:18 (GMT) |
---|---|---|
committer | aavit <qt-info@nokia.com> | 2011-09-22 09:02:18 (GMT) |
commit | 1b215938323d42276efcf8c293c5da66dca7c76a (patch) | |
tree | 059b57324eb56bc8f403dbb05bbbb447f2212f52 /src/gui/styles/qs60style.h | |
parent | 128c4166ba445112ab73dd98b3e403da0489656e (diff) | |
parent | 085bd7cf2d76f9acd548120f859201b014970a72 (diff) | |
download | Qt-1b215938323d42276efcf8c293c5da66dca7c76a.zip Qt-1b215938323d42276efcf8c293c5da66dca7c76a.tar.gz Qt-1b215938323d42276efcf8c293c5da66dca7c76a.tar.bz2 |
Merge remote-tracking branch 'qt-mainline/4.8'
Conflicts:
dist/changes-4.8.0
Diffstat (limited to 'src/gui/styles/qs60style.h')
0 files changed, 0 insertions, 0 deletions