Commit 5d146374 authored by Oswald Buddenhagen's avatar Oswald Buddenhagen
Browse files

Merge remote branch 'origin/1.3'

Conflicts:
	share/qtcreator/translations/qtcreator_ru.ts
parents 7828bb81 05cf6ff4
......@@ -12317,7 +12317,7 @@ to version control (%2)?</source>
<message>
<location filename="../../../src/plugins/qt4projectmanager/qt4nodes.cpp" line="+80"/>
<source>Headers</source>
<translation>Заговолочные</translation>
<translation>Заголовочные</translation>
</message>
<message>
<location line="+3"/>
......
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