diff options
author | axis <qt-info@nokia.com> | 2010-02-19 10:48:45 (GMT) |
---|---|---|
committer | axis <qt-info@nokia.com> | 2010-02-19 10:48:45 (GMT) |
commit | 1c48ec8f4876db0b4c7b86dd19ab8bb27c082786 (patch) | |
tree | 8ca2723a27ae670b3e84dfb21b6a3a28d3bbe401 /mkspecs/wincewm60standard-msvc2005 | |
parent | 0374c15075f98b0b4efbb1c00ef3812b67fabe0f (diff) | |
parent | ade4d096fc2ea145a3d9586e3ab2a9af9c5a9a72 (diff) | |
download | Qt-1c48ec8f4876db0b4c7b86dd19ab8bb27c082786.zip Qt-1c48ec8f4876db0b4c7b86dd19ab8bb27c082786.tar.gz Qt-1c48ec8f4876db0b4c7b86dd19ab8bb27c082786.tar.bz2 |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into merge-with-qt-master
Conflicts:
qmake/generators/symbian/symmake.cpp
Diffstat (limited to 'mkspecs/wincewm60standard-msvc2005')
0 files changed, 0 insertions, 0 deletions