diff options
| author | Jan-Arve Sæther <jan-arve.saether@nokia.com> | 2009-10-16 10:51:26 (GMT) |
|---|---|---|
| committer | Jan-Arve Sæther <jan-arve.saether@nokia.com> | 2009-10-16 10:51:26 (GMT) |
| commit | e0a5d1f18d5dee85ddc312094f5bb4d49ea3d286 (patch) | |
| tree | d735dcb44a164aa2e7d2b163841a5c00da56339e /.gitignore | |
| parent | 5f184a0c3485f9c8e35d3cc7c3c2f715f0f94111 (diff) | |
| parent | ea52aef43acf862a51ea5b2eb65fa2ad60e5590f (diff) | |
| download | Qt-e0a5d1f18d5dee85ddc312094f5bb4d49ea3d286.zip Qt-e0a5d1f18d5dee85ddc312094f5bb4d49ea3d286.tar.gz Qt-e0a5d1f18d5dee85ddc312094f5bb4d49ea3d286.tar.bz2 | |
Merge branch 'fixes' of git://gitorious.org/~fleury/qt/fleury-openbossa-clone into 4.6
Conflicts:
src/gui/graphicsview/qgraphicsanchorlayout_p.cpp
src/gui/graphicsview/qgraphicsanchorlayout_p.h
tests/auto/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions