diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@nokia.com> | 2010-10-28 11:28:58 (GMT) |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@nokia.com> | 2010-10-28 11:28:58 (GMT) |
| commit | e7b9fb2e87641a36301babf457056b3350f0431c (patch) | |
| tree | 3db3d29297d29ac1801a33d50c1273efec97352b /translations/designer_ja.ts | |
| parent | b36e845dde90313cf98df118ce6ffd88502b943b (diff) | |
| parent | 77819edac505823226c40033e76d2dda0e8b363a (diff) | |
| download | Qt-e7b9fb2e87641a36301babf457056b3350f0431c.zip Qt-e7b9fb2e87641a36301babf457056b3350f0431c.tar.gz Qt-e7b9fb2e87641a36301babf457056b3350f0431c.tar.bz2 | |
Merge remote branch 'scm/qt/master'
Conflicts:
mkspecs/symbian-gcce/qmake.conf
Diffstat (limited to 'translations/designer_ja.ts')
0 files changed, 0 insertions, 0 deletions