diff options
| author | Alexis Menard <alexis.menard@nokia.com> | 2009-06-16 08:34:44 (GMT) |
|---|---|---|
| committer | Alexis Menard <alexis.menard@nokia.com> | 2009-06-16 08:34:44 (GMT) |
| commit | fec52b0c12386cbd3fd7d8cb886afaef5e30a744 (patch) | |
| tree | 01fa9a01f880e04f74d067e579d165904d02b11f /src/gui/graphicsview/qgraphicssceneindex.cpp | |
| parent | 3dce31e5eb0fac43d445fb9664f1b68f4cd4c11f (diff) | |
| parent | ea83669b9b44b1fb3a5acae6d53afd1df401e9b5 (diff) | |
| download | Qt-fec52b0c12386cbd3fd7d8cb886afaef5e30a744.zip Qt-fec52b0c12386cbd3fd7d8cb886afaef5e30a744.tar.gz Qt-fec52b0c12386cbd3fd7d8cb886afaef5e30a744.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into qt-main/qgraphicssceneindex
Conflicts:
src/gui/graphicsview/graphicsview.pri
src/gui/graphicsview/qgraphicsitem.cpp
Diffstat (limited to 'src/gui/graphicsview/qgraphicssceneindex.cpp')
0 files changed, 0 insertions, 0 deletions