diff options
| author | Jan-Arve Sæther <jan-arve.saether@nokia.com> | 2009-11-27 11:40:48 (GMT) |
|---|---|---|
| committer | Jan-Arve Sæther <jan-arve.saether@nokia.com> | 2009-11-27 11:40:48 (GMT) |
| commit | 9e68da0680d5b85a0713142df9b7ad9674960353 (patch) | |
| tree | 6b8a7a6e53f80112ce1030f3943b204acfd4316a /tests/auto/qdbusperformance | |
| parent | aa911fcc8cae12c92941e21a02b7621d4e4bf118 (diff) | |
| parent | f95cf16c3330cea6821bcaf26aa7d0948f61729f (diff) | |
| download | Qt-9e68da0680d5b85a0713142df9b7ad9674960353.zip Qt-9e68da0680d5b85a0713142df9b7ad9674960353.tar.gz Qt-9e68da0680d5b85a0713142df9b7ad9674960353.tar.bz2 | |
Merge branch 'fixes' of git://gitorious.org/~fleury/qt/fleury-openbossa-clone into fleury-fixes
Conflicts:
tests/auto/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp
Diffstat (limited to 'tests/auto/qdbusperformance')
0 files changed, 0 insertions, 0 deletions