diff options
| author | David Boddie <dboddie@trolltech.com> | 2010-01-29 14:54:26 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2010-01-29 14:54:26 (GMT) |
| commit | bde40a9fa852107c237ac408f93a33b5955b9290 (patch) | |
| tree | 63f23cad8386170a1afe6984fbe9f81511071832 /doc/src/development/assistant-manual.qdoc | |
| parent | 1492a2edf269b368abd2af9f8ffb474489609b5d (diff) | |
| parent | 9a6f11ab7651b6c66771033245906f43a0e651b3 (diff) | |
| download | Qt-bde40a9fa852107c237ac408f93a33b5955b9290.zip Qt-bde40a9fa852107c237ac408f93a33b5955b9290.tar.gz Qt-bde40a9fa852107c237ac408f93a33b5955b9290.tar.bz2 | |
Merge commit 'refs/merge-requests/388' of git://gitorious.org/qt/qt into integration
Conflicts:
examples/dbus/dbus-chat/chat_adaptor.cpp
examples/dbus/dbus-chat/chat_adaptor.h
examples/dbus/dbus-chat/chat_interface.cpp
examples/dbus/dbus-chat/chat_interface.h
examples/dbus/remotecontrolledcar/car/car_adaptor.cpp
examples/dbus/remotecontrolledcar/controller/car_interface.cpp
Diffstat (limited to 'doc/src/development/assistant-manual.qdoc')
0 files changed, 0 insertions, 0 deletions