diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-09-29 14:57:57 (GMT) |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-09-29 14:57:57 (GMT) |
| commit | 5a66fb4306db94a50756bc82ad7b968ee44afe43 (patch) | |
| tree | 084d5add1fb844a991c0a541daab90753f7ea602 /demos | |
| parent | c275874bf96dbca05e9a2c15cd970138d78ac595 (diff) | |
| parent | 7e979a9a0330a533bbe1693ba68d3737af664a77 (diff) | |
| download | Qt-5a66fb4306db94a50756bc82ad7b968ee44afe43.zip Qt-5a66fb4306db94a50756bc82ad7b968ee44afe43.tar.gz Qt-5a66fb4306db94a50756bc82ad7b968ee44afe43.tar.bz2 | |
Merge commit 'origin/4.5' into 4.6
Conflicts:
translations/qtconfig_ru.ts
Diffstat (limited to 'demos')
0 files changed, 0 insertions, 0 deletions