diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-26 14:15:38 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-26 14:15:38 (GMT) |
commit | 5d1d426afe07458a91b4908881554653285ed04c (patch) | |
tree | 373cc0f4530ef6e46fca2eea63cb18ef9bd10f05 /tools | |
parent | 8a6086b6cc7f535f12f4ac617a9634cf7417c6ff (diff) | |
parent | 7ca00ed67cb18fb858e1e89cec21b3db696fa923 (diff) | |
download | Qt-5d1d426afe07458a91b4908881554653285ed04c.zip Qt-5d1d426afe07458a91b4908881554653285ed04c.tar.gz Qt-5d1d426afe07458a91b4908881554653285ed04c.tar.bz2 |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Added addMMPRules for adding conditional MMP_RULES
Allow overriding TARGET.EPOCHEAPSIZE with MMP_RULES
Diffstat (limited to 'tools')
0 files changed, 0 insertions, 0 deletions