summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorThierry Bastian <thierry.bastian@nokia.com>2010-11-11 00:00:11 (GMT)
committerThierry Bastian <thierry.bastian@nokia.com>2010-11-11 00:00:11 (GMT)
commitf153f135f18b0874d456f01ea8d73d127685b3fb (patch)
treed064f9acb095dbbab9970f8fc94326720ea8bac1 /doc
parentf3db8942eff666aba663c47f0dc234ac2d4ecbd4 (diff)
parente8ddca677db9b0d3ac8ff1b2079c3b000d59d6ec (diff)
downloadQt-f153f135f18b0874d456f01ea8d73d127685b3fb.zip
Qt-f153f135f18b0874d456f01ea8d73d127685b3fb.tar.gz
Qt-f153f135f18b0874d456f01ea8d73d127685b3fb.tar.bz2
Merge branch 'master-upstream' into master-water
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions