summaryrefslogtreecommitdiffstats
path: root/src/plugins/accessible
diff options
context:
space:
mode:
authorRohan McGovern <rohan.mcgovern@nokia.com>2009-09-09 03:45:11 (GMT)
committerRohan McGovern <rohan.mcgovern@nokia.com>2009-09-09 03:45:11 (GMT)
commit8d37cc2a85f6aa1b9ca3ddc3a923befb4434c62c (patch)
tree98652a86fe2125ccb7a7c194b1e1da205f9eb79d /src/plugins/accessible
parent39bcbc8df52eb5df5f7e39dc4265c8a77d3881be (diff)
parent4feb4019cfc144cef4cd9177d52e52dee9ebdf32 (diff)
downloadQt-8d37cc2a85f6aa1b9ca3ddc3a923befb4434c62c.zip
Qt-8d37cc2a85f6aa1b9ca3ddc3a923befb4434c62c.tar.gz
Qt-8d37cc2a85f6aa1b9ca3ddc3a923befb4434c62c.tar.bz2
Merge commit '4feb4019cfc144cef4cd9177d52e52dee9ebdf32' into 4.6
Conflicts: tests/auto/network-settings.h tests/auto/qpainter/tst_qpainter.cpp
Diffstat (limited to 'src/plugins/accessible')
0 files changed, 0 insertions, 0 deletions