diff options
author | axis <qt-info@nokia.com> | 2009-12-11 08:57:27 (GMT) |
---|---|---|
committer | axis <qt-info@nokia.com> | 2009-12-11 08:57:27 (GMT) |
commit | 19e406c08fdaa30fd101cd017cc01b2397b67ee3 (patch) | |
tree | d93dd980de23b9ca0a53d18fa6af086b98647857 /translations/linguist_ja.ts | |
parent | e355ade4712fa63794403dae3fda807a58e8b88d (diff) | |
parent | b62c6de3eae005da146a9009f86851a1431b1892 (diff) | |
download | Qt-19e406c08fdaa30fd101cd017cc01b2397b67ee3.zip Qt-19e406c08fdaa30fd101cd017cc01b2397b67ee3.tar.gz Qt-19e406c08fdaa30fd101cd017cc01b2397b67ee3.tar.bz2 |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6-s60
Conflicts:
src/s60installs/bwins/QtGuiu.def
Diffstat (limited to 'translations/linguist_ja.ts')
0 files changed, 0 insertions, 0 deletions