diff options
| author | Jan-Arve Sæther <jan-arve.saether@nokia.com> | 2009-12-01 12:31:51 (GMT) |
|---|---|---|
| committer | Jan-Arve Sæther <jan-arve.saether@nokia.com> | 2009-12-01 12:31:51 (GMT) |
| commit | 0335a82c1e8b006ad123bddb012ee354a41b727a (patch) | |
| tree | ac93e25c974b8f2af03aee2817837512050b54d8 /tests/auto/qdbuslocalcalls/.gitignore | |
| parent | 1d5621a4958ab6f250566c26f891d3e99c6f8585 (diff) | |
| parent | 89e26da4374563c9419da1357a24cf9618d804d6 (diff) | |
| download | Qt-0335a82c1e8b006ad123bddb012ee354a41b727a.zip Qt-0335a82c1e8b006ad123bddb012ee354a41b727a.tar.gz Qt-0335a82c1e8b006ad123bddb012ee354a41b727a.tar.bz2 | |
Merge branch 'ooo-sequential' of git://gitorious.org/~fleury/qt/fleury-openbossa-clone into fleury-ooo-sequential
Conflicts:
tests/auto/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp
Diffstat (limited to 'tests/auto/qdbuslocalcalls/.gitignore')
0 files changed, 0 insertions, 0 deletions