diff options
author | axis <qt-info@nokia.com> | 2009-06-22 09:52:52 (GMT) |
---|---|---|
committer | axis <qt-info@nokia.com> | 2009-06-22 09:52:52 (GMT) |
commit | adfbda42cb20bbfea139c831fc9e015208b5ce2c (patch) | |
tree | ab5f3e188073f05d9625a711e0775141b30276ac /src | |
parent | afceb76c880cf346f92e1c0e95d7fed07fbbe8a0 (diff) | |
parent | 112391d20adb222e6cfd93e0386031a0d27a22bf (diff) | |
download | Qt-adfbda42cb20bbfea139c831fc9e015208b5ce2c.zip Qt-adfbda42cb20bbfea139c831fc9e015208b5ce2c.tar.gz Qt-adfbda42cb20bbfea139c831fc9e015208b5ce2c.tar.bz2 |
Merge branch 'master' of git@scm:qt/qt-s60-public
Conflicts:
dist/changes-4.5.2-tower
Diffstat (limited to 'src')
0 files changed, 0 insertions, 0 deletions