diff options
| author | axis <qt-info@nokia.com> | 2010-03-18 07:57:42 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2010-03-18 07:57:42 (GMT) |
| commit | d3cba714adb35098d515f7c4f8e90a4e38527d76 (patch) | |
| tree | 60018e4f20fc6b58017081b5e9e043d36a7ee3a9 /LGPL_EXCEPTION.txt | |
| parent | 09c2a804b700ec51f44bda567b806181d00bc161 (diff) | |
| parent | e483886bcfcf7252af9ac7cc89de15f912bf69da (diff) | |
| download | Qt-d3cba714adb35098d515f7c4f8e90a4e38527d76.zip Qt-d3cba714adb35098d515f7c4f8e90a4e38527d76.tar.gz Qt-d3cba714adb35098d515f7c4f8e90a4e38527d76.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-s60
Conflicts:
qmake/generators/symbian/symmake_abld.cpp
Diffstat (limited to 'LGPL_EXCEPTION.txt')
0 files changed, 0 insertions, 0 deletions