diff options
| author | Martin Jones <martin.jones@nokia.com> | 2009-06-02 01:59:28 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2009-06-02 01:59:28 (GMT) |
| commit | 7c963ed70317191bb9f6eec5e8cc79fc985bf00b (patch) | |
| tree | dcb6b4697e0f5a12874d053d848bf4965616efef /src/dbus/qdbusconnection_p.h | |
| parent | c968390815e2bd578460d1a22a86ded10f373610 (diff) | |
| parent | 02a8ba7ce8e5ca07ed8e3e83f10a18acd6e38a10 (diff) | |
| download | Qt-7c963ed70317191bb9f6eec5e8cc79fc985bf00b.zip Qt-7c963ed70317191bb9f6eec5e8cc79fc985bf00b.tar.gz Qt-7c963ed70317191bb9f6eec5e8cc79fc985bf00b.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Conflicts:
src/declarative/util/qfxperf.cpp
Diffstat (limited to 'src/dbus/qdbusconnection_p.h')
0 files changed, 0 insertions, 0 deletions