diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-03-17 17:30:08 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-03-17 17:30:08 (GMT) |
| commit | 0a5bcc8a0ab57becc36b140954b7034b3d11efbc (patch) | |
| tree | 2310a77cf20d10609603c04f7d1bf29e9aec8042 /translations/assistant_ja.ts | |
| parent | 4c1f54097a1fb1acff817ba8caa8af347ae56cd2 (diff) | |
| parent | 83e321747920c31d6fa4c860de3683630fbedb5d (diff) | |
| download | Qt-0a5bcc8a0ab57becc36b140954b7034b3d11efbc.zip Qt-0a5bcc8a0ab57becc36b140954b7034b3d11efbc.tar.gz Qt-0a5bcc8a0ab57becc36b140954b7034b3d11efbc.tar.bz2 | |
Merge remote branch 'origin/4.6' into qt-4.7-from-4.6
Conflicts:
src/s60installs/bwins/QtCoreu.def
src/s60installs/eabi/QtCoreu.def
Diffstat (limited to 'translations/assistant_ja.ts')
0 files changed, 0 insertions, 0 deletions