Commit f901cbff authored by Eike Ziller's avatar Eike Ziller

Merge remote-tracking branch 'origin/4.2' into 4.3

Change-Id: If2076ea858d166093c37e9cf52d38f3ad9115012
parents 1a4531df e5cf97f4
This diff is collapsed.
......@@ -2,7 +2,7 @@ TEMPLATE = aux
LANGUAGES = cs de fr ja pl ru sl uk zh_CN zh_TW
LANGUAGES = cs da de fr ja pl ru sl uk zh_CN zh_TW
# *don't* re-enable these without a prior rework
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