diff options
| author | axis <qt-info@nokia.com> | 2009-06-22 12:22:59 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2009-06-22 12:22:59 (GMT) |
| commit | 5db09b402d42d9c3a476f6cfb8430d56ee826ddf (patch) | |
| tree | 2ff44b31f9214c8d22f76fe237aaaf18f9addaf9 /qmake/project.cpp | |
| parent | 41ea40a0bfd1a288c4b433d215aa475ac0f494ab (diff) | |
| parent | 09e7769a30f866447716e46574ece9d5e373c1a7 (diff) | |
| download | Qt-5db09b402d42d9c3a476f6cfb8430d56ee826ddf.zip Qt-5db09b402d42d9c3a476f6cfb8430d56ee826ddf.tar.gz Qt-5db09b402d42d9c3a476f6cfb8430d56ee826ddf.tar.bz2 | |
Merge branch 'master' of git@scm:qt/qt-s60-public
Conflicts:
dist/changes-4.5.2-tower
Diffstat (limited to 'qmake/project.cpp')
0 files changed, 0 insertions, 0 deletions