diff options
author | Thierry Bastian <thierry.bastian@nokia.com> | 2010-11-04 23:00:10 (GMT) |
---|---|---|
committer | Thierry Bastian <thierry.bastian@nokia.com> | 2010-11-04 23:00:10 (GMT) |
commit | 9ec03f667410ab672c855fad8061dbb5f7b20711 (patch) | |
tree | 41442917a9d1071cb588f94305a3f3e47ab254c6 /translations/translations.pro | |
parent | 447c5812f996b632734fc74ca491422e7cbbed43 (diff) | |
parent | 1a7a1172d048108c30a9890ce9477686711ad756 (diff) | |
download | Qt-9ec03f667410ab672c855fad8061dbb5f7b20711.zip Qt-9ec03f667410ab672c855fad8061dbb5f7b20711.tar.gz Qt-9ec03f667410ab672c855fad8061dbb5f7b20711.tar.bz2 |
Merge branch '4.7-upstream' into 4.7-water
Diffstat (limited to 'translations/translations.pro')
0 files changed, 0 insertions, 0 deletions