diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-10-01 17:22:36 (GMT) |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-10-01 17:22:36 (GMT) |
| commit | 79b1b80f9eecfe2287dc3ea940859999ea4a6e23 (patch) | |
| tree | ac6c53c492a6104efbd245cef8ae3fcef26a700f | |
| parent | 712eece4e399fe5ca916ecf7b6d77fdddddbf7fe (diff) | |
| parent | 3c2d0a7812a7add0aa954657356ecce136ad6f42 (diff) | |
| download | Qt-79b1b80f9eecfe2287dc3ea940859999ea4a6e23.zip Qt-79b1b80f9eecfe2287dc3ea940859999ea4a6e23.tar.gz Qt-79b1b80f9eecfe2287dc3ea940859999ea4a6e23.tar.bz2 | |
Merge commit 'origin/4.5' into 4.6
Conflicts:
tests/auto/linguist/lupdate/testdata/good/mergeui/project.ts.before
tests/auto/linguist/lupdate/testdata/good/mergeui/project.ts.result
tools/linguist/shared/java.cpp
0 files changed, 0 insertions, 0 deletions