summaryrefslogtreecommitdiffstats
path: root/tests/auto/qfiledialog
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@nokia.com>2009-10-08 16:02:01 (GMT)
committerThiago Macieira <thiago.macieira@nokia.com>2009-10-08 16:02:01 (GMT)
commit3945fd75a93d790434b33c2d23add155893a82a4 (patch)
treee83166a337857381d1c152d0bb9c0f1c5d101efc /tests/auto/qfiledialog
parentf7e13aefc24b98299d8fd44cad60cc13b16e4114 (diff)
parentaa863c61ec5e68ff73c02e25a2954cdba9c2ef15 (diff)
downloadQt-3945fd75a93d790434b33c2d23add155893a82a4.zip
Qt-3945fd75a93d790434b33c2d23add155893a82a4.tar.gz
Qt-3945fd75a93d790434b33c2d23add155893a82a4.tar.bz2
Merge branch '4.5' into 4.6
Conflicts: src/gui/itemviews/qheaderview.cpp
Diffstat (limited to 'tests/auto/qfiledialog')
0 files changed, 0 insertions, 0 deletions