summaryrefslogtreecommitdiffstats
path: root/tests/auto/qitemdelegate
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>2009-11-10 13:36:53 (GMT)
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>2009-11-10 13:36:53 (GMT)
commit7b15c669c336a1d76e3ac001fadde38a294e3e80 (patch)
tree2b8e9631019d1bc9af37d9a93bb93ce0eb16381a /tests/auto/qitemdelegate
parent47bc34f413d9a0c6efac6ca3eead95eed7da2e40 (diff)
parent86048e1a09fce11f557d0e8b117229a754ee9098 (diff)
downloadQt-7b15c669c336a1d76e3ac001fadde38a294e3e80.zip
Qt-7b15c669c336a1d76e3ac001fadde38a294e3e80.tar.gz
Qt-7b15c669c336a1d76e3ac001fadde38a294e3e80.tar.bz2
Merge branch 'tools-team/4.6' (early part) into 4.6
Conflicts: src/corelib/tools/qscopedpointer.h
Diffstat (limited to 'tests/auto/qitemdelegate')
0 files changed, 0 insertions, 0 deletions