summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@digia.com>2010-02-26 13:24:11 (GMT)
committerMiikka Heikkinen <miikka.heikkinen@digia.com>2010-02-26 13:24:11 (GMT)
commitb78012c855a8b00fa0d100cd0cf6c8de024dfa69 (patch)
tree75cd20ff9e068c04996daf0d4aed4e15b49b5992 /tests
parent5e9382c018e231c5e2ef49dd8a38eaff535b9837 (diff)
parent7ca00ed67cb18fb858e1e89cec21b3db696fa923 (diff)
downloadQt-b78012c855a8b00fa0d100cd0cf6c8de024dfa69.zip
Qt-b78012c855a8b00fa0d100cd0cf6c8de024dfa69.tar.gz
Qt-b78012c855a8b00fa0d100cd0cf6c8de024dfa69.tar.bz2
Merge branch '4.6'
Conflicts: mkspecs/common/symbian/symbian.conf
Diffstat (limited to 'tests')
0 files changed, 0 insertions, 0 deletions