diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-10-16 16:26:06 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-10-16 16:26:06 (GMT) |
| commit | af1fa7fe766980210d7363c1559197f34b10d834 (patch) | |
| tree | e2964649ca8469269950a265060b3d1e7e6026f6 /doc/src/deployment/deployment.qdoc | |
| parent | c5bfbe27f5bbdb1f3e76af8ca5e0f4df27875a06 (diff) | |
| parent | 1433a2c8682cb1c8f89ceaf97ad7a509ac686879 (diff) | |
| download | Qt-af1fa7fe766980210d7363c1559197f34b10d834.zip Qt-af1fa7fe766980210d7363c1559197f34b10d834.tar.gz Qt-af1fa7fe766980210d7363c1559197f34b10d834.tar.bz2 | |
Merge branch '4.6'
Conflicts:
translations/assistant_adp_pl.ts
translations/assistant_adp_ru.ts
Diffstat (limited to 'doc/src/deployment/deployment.qdoc')
0 files changed, 0 insertions, 0 deletions