summaryrefslogtreecommitdiffstats
path: root/src/gui/graphicsview
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@nokia.com>2009-06-18 14:51:35 (GMT)
committerSimon Hausmann <simon.hausmann@nokia.com>2009-06-18 14:51:35 (GMT)
commit396eeb3f71c1c7edd861da1c8a8ec3086348502e (patch)
tree3ff6670ef4b192fd0993e0e9629e616570a6475a /src/gui/graphicsview
parente356eed2fa3d8e62085d6bd72caba9d11c40bacf (diff)
parent31ed96ef2c34429d61a5d9d1c1b7fe4fc17c708b (diff)
downloadQt-396eeb3f71c1c7edd861da1c8a8ec3086348502e.zip
Qt-396eeb3f71c1c7edd861da1c8a8ec3086348502e.tar.gz
Qt-396eeb3f71c1c7edd861da1c8a8ec3086348502e.tar.bz2
Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qt
Conflicts: configure.exe tests/auto/qpainter/tst_qpainter.cpp translations/qt_ru.ts
Diffstat (limited to 'src/gui/graphicsview')
0 files changed, 0 insertions, 0 deletions