diff options
| author | Aapo Haapanen <aapo.haapanen@nokia.com> | 2011-09-23 12:23:59 (GMT) |
|---|---|---|
| committer | Aapo Haapanen <aapo.haapanen@nokia.com> | 2011-09-23 12:23:59 (GMT) |
| commit | 34c76d44c52342fc1a69f1530503a440376818e5 (patch) | |
| tree | 29221eaa7b6021002e6ac0596a526a0c9fd8b800 | |
| parent | 00a3147f66688b71069989bbac406a00f6e8cf83 (diff) | |
| parent | 055d68ce72a9cfbaffa5ac85314aff215e7a74c6 (diff) | |
| download | Qt-34c76d44c52342fc1a69f1530503a440376818e5.zip Qt-34c76d44c52342fc1a69f1530503a440376818e5.tar.gz Qt-34c76d44c52342fc1a69f1530503a440376818e5.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-flex
Conflicts:
src/xmlpatterns/api/qxmlquery.cpp
0 files changed, 0 insertions, 0 deletions