Merge remote branch 'origin/1.3'

Conflicts: share/qtcreator/translations/translations.pro

Merge remote branch 'origin/1.3'
Conflicts: share/qtcreator/translations/translations.pro
7f4647ec · con · f0674aa7 · 32b5d176 · 7f4647ec · 7f4647ec
Commit 7f4647ec authored Feb 23, 2010 by con
--- a/share/qtcreator/translations/qtcreator_cs.ts
+++ b/share/qtcreator/translations/qtcreator_cs.ts
--- a/share/qtcreator/translations/translations.pro
+++ b/share/qtcreator/translations/translations.pro
 include(../../../qtcreator.pri)

-LANGUAGES = de es fr hu it ja pl ru sl
+LANGUAGES = cs de es fr hu it ja pl ru sl

 # var, prepend, append
 defineReplace(prependAll) {