summaryrefslogtreecommitdiffstats
path: root/src/script
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-01-11 05:47:02 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-01-11 05:47:02 (GMT)
commit9417c6cf7eba29fd7ee4bb7adffd2722729af633 (patch)
tree98f789486ad1488fb96b142e0273d86423563ae2 /src/script
parente32bb8f0e79232419b9516fa8273eadbaa8aad9e (diff)
parent8d76de98d93421395306941e59d136f1e7395d15 (diff)
downloadQt-9417c6cf7eba29fd7ee4bb7adffd2722729af633.zip
Qt-9417c6cf7eba29fd7ee4bb7adffd2722729af633.tar.gz
Qt-9417c6cf7eba29fd7ee4bb7adffd2722729af633.tar.bz2
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (Sqlite2) Fix for QTBUG-6421
Diffstat (limited to 'src/script')
0 files changed, 0 insertions, 0 deletions