diff options
| author | Bea Lam <bea.lam@nokia.com> | 2010-04-21 02:15:35 (GMT) |
|---|---|---|
| committer | Bea Lam <bea.lam@nokia.com> | 2010-04-21 02:15:35 (GMT) |
| commit | 53d45db5390a6e7e68f6b8b68730924843c10560 (patch) | |
| tree | f9c632f103e2728ae4fcbc7f4f24cb5418d143c5 /examples/ipc | |
| parent | 3844612ee34076d24822ad0fe4115b7d5936d8f5 (diff) | |
| parent | f92518f6de1a13b591fb2c2037714b213bdcff89 (diff) | |
| download | Qt-53d45db5390a6e7e68f6b8b68730924843c10560.zip Qt-53d45db5390a6e7e68f6b8b68730924843c10560.tar.gz Qt-53d45db5390a6e7e68f6b8b68730924843c10560.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Conflicts:
tests/auto/declarative/qdeclarativedebugclient/tst_qdeclarativedebugclient.cpp
tests/auto/declarative/qdeclarativedebugservice/tst_qdeclarativedebugservice.cpp
Diffstat (limited to 'examples/ipc')
0 files changed, 0 insertions, 0 deletions