diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-02-26 16:49:58 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-02-26 16:49:58 (GMT) |
| commit | 7f018afe5ab8c2077880a239b0ab5ecbdb1d5b7d (patch) | |
| tree | 27bbf204f0fac8d99b4b4056337fc66c2733b24d /mkspecs/linux-llvm/qmake.conf | |
| parent | 27e403d9c6185c606980bb7881e39a2c88138a13 (diff) | |
| parent | 5d1d426afe07458a91b4908881554653285ed04c (diff) | |
| download | Qt-7f018afe5ab8c2077880a239b0ab5ecbdb1d5b7d.zip Qt-7f018afe5ab8c2077880a239b0ab5ecbdb1d5b7d.tar.gz Qt-7f018afe5ab8c2077880a239b0ab5ecbdb1d5b7d.tar.bz2 | |
Merge remote branch 'origin/4.6' into qt-master-from-4.6
Conflicts:
mkspecs/common/symbian/symbian.conf
qmake/generators/symbian/initprojectdeploy_symbian.cpp
qmake/generators/symbian/symmake_abld.h
Diffstat (limited to 'mkspecs/linux-llvm/qmake.conf')
0 files changed, 0 insertions, 0 deletions