Commit 7f4647ec authored by con's avatar con
Browse files

Merge remote branch 'origin/1.3'

Conflicts:
	share/qtcreator/translations/translations.pro
parents f0674aa7 32b5d176
This diff is collapsed.
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) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment