summaryrefslogtreecommitdiffstats
path: root/.hgignore
diff options
context:
space:
mode:
authoraxis <qt-info@nokia.com>2010-07-21 14:23:43 (GMT)
committeraxis <qt-info@nokia.com>2010-07-21 14:23:43 (GMT)
commitccfb67704285f60ce31bb05538f08ca6f32c6f1d (patch)
tree1b90180dfe6900b8d36c7f33bf8bbc2b10bf33fb /.hgignore
parent11d626de5fd87fc8cbd9d685bde8217c7ad7fae6 (diff)
parentae64f51f092d7ffb20cb50b0e9cd9b019c0e8831 (diff)
downloadQt-ccfb67704285f60ce31bb05538f08ca6f32c6f1d.zip
Qt-ccfb67704285f60ce31bb05538f08ca6f32c6f1d.tar.gz
Qt-ccfb67704285f60ce31bb05538f08ca6f32c6f1d.tar.bz2
Merge branch 'raptorConfigurePatches' into 4.7-s60
Conflicts: configure src/sql/drivers/drivers.pri
Diffstat (limited to '.hgignore')
0 files changed, 0 insertions, 0 deletions