diff options
author | Rhys Weatherley <rhys.weatherley@nokia.com> | 2010-02-24 04:16:04 (GMT) |
---|---|---|
committer | Rhys Weatherley <rhys.weatherley@nokia.com> | 2010-02-24 04:16:04 (GMT) |
commit | 6680766bcdd5bff7f1a871c711202a30fe91e25e (patch) | |
tree | 668400393f44d7abf6099bb1ce78d431902e1b63 /LICENSE.LGPL | |
parent | d3e494b78a00a8109005b2c86605920799ad12c8 (diff) | |
parent | 4d615766184e3eeee25ffc634847bec1edd47ac0 (diff) | |
download | Qt-6680766bcdd5bff7f1a871c711202a30fe91e25e.zip Qt-6680766bcdd5bff7f1a871c711202a30fe91e25e.tar.gz Qt-6680766bcdd5bff7f1a871c711202a30fe91e25e.tar.bz2 |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt
Conflicts:
configure
Diffstat (limited to 'LICENSE.LGPL')
0 files changed, 0 insertions, 0 deletions