diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-01-19 09:57:13 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-01-19 09:57:13 (GMT) |
commit | 5d5461af95d6f7a6b4efd9448e463c361c414dd2 (patch) | |
tree | 0fa0ae70a65d7fb98efa12633c511886621a77db /src/xmlpatterns/parser/qquerytransformparser.cpp | |
parent | 3cb3c9a7922cd96744ff0e15790103dbb68b3bf9 (diff) | |
parent | 7d8c3cb2e531ce6df8d14096b0b3d31f517e767a (diff) | |
download | Qt-5d5461af95d6f7a6b4efd9448e463c361c414dd2.zip Qt-5d5461af95d6f7a6b4efd9448e463c361c414dd2.tar.gz Qt-5d5461af95d6f7a6b4efd9448e463c361c414dd2.tar.bz2 |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1:
another attempt at fixing the translations build
use same small color dialog on S60 and Maemo 5
fix qm generation under windows
Diffstat (limited to 'src/xmlpatterns/parser/qquerytransformparser.cpp')
0 files changed, 0 insertions, 0 deletions