diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-02-27 10:21:23 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-02-27 10:21:23 (GMT) |
| commit | f33ee0c7883cc525b4fbb81c6128bde51cd5e233 (patch) | |
| tree | 7ff52a836ef35345872a2444b036509265a1dd19 /qmake/qmake.pro | |
| parent | 7f018afe5ab8c2077880a239b0ab5ecbdb1d5b7d (diff) | |
| parent | 31450ba3b0d83dba4e171ae966295b173ac1fb0f (diff) | |
| download | Qt-f33ee0c7883cc525b4fbb81c6128bde51cd5e233.zip Qt-f33ee0c7883cc525b4fbb81c6128bde51cd5e233.tar.gz Qt-f33ee0c7883cc525b4fbb81c6128bde51cd5e233.tar.bz2 | |
Merge remote branch 'origin/master' into qt-master-from-4.6
Conflicts:
mkspecs/common/symbian/symbian.conf
Diffstat (limited to 'qmake/qmake.pro')
0 files changed, 0 insertions, 0 deletions