diff options
author | Olivier Goffart <ogoffart@trolltech.com> | 2009-11-06 17:09:27 (GMT) |
---|---|---|
committer | Olivier Goffart <ogoffart@trolltech.com> | 2009-11-06 17:09:27 (GMT) |
commit | 7ee944a14582cd7202b4a8e94adc06e7ae5855a6 (patch) | |
tree | 0684ab4a4e02dc72c2e1f5bc72baaf55f0d0310f /dist/changes-3.1.2 | |
parent | cd58bc13a4a37543d76a79b3cee7cd95bde0a14b (diff) | |
parent | 12d14efb2e1df3188c7c0001492f24fd193a11a9 (diff) | |
download | Qt-7ee944a14582cd7202b4a8e94adc06e7ae5855a6.zip Qt-7ee944a14582cd7202b4a8e94adc06e7ae5855a6.tar.gz Qt-7ee944a14582cd7202b4a8e94adc06e7ae5855a6.tar.bz2 |
Merge commit 'origin/4.6' into 4.6
Conflicts:
dist/changes-4.6.0
Diffstat (limited to 'dist/changes-3.1.2')
0 files changed, 0 insertions, 0 deletions