summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorDenis Dzyubenko <denis.dzyubenko@nokia.com>2010-06-11 11:26:05 (GMT)
committerJason McDonald <jason.mcdonald@nokia.com>2010-06-30 01:26:55 (GMT)
commit53c58703223bdc8cef84b0d26f80573be3de91fb (patch)
tree8ac01ec45fd5e7f9b0e82b05a937c12b99f39ee2 /doc
parentd7513a5994c734ed48e95ec55d1abd9147c75405 (diff)
downloadQt-4.7.0-beta2.zip
Qt-4.7.0-beta2.tar.gz
Qt-4.7.0-beta2.tar.bz2
Fixed a broken merge.v4.7.0-beta2
Reviewed-by: trustme (cherry picked from commit 24bcac9de46c89f4d8b533946e7b0feeacca1b0d)
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions