OSDN Git Service

Merge remote branch 'origin/1.3'
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>
Wed, 10 Mar 2010 09:32:26 +0000 (10:32 +0100)
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>
Wed, 10 Mar 2010 09:32:26 +0000 (10:32 +0100)
commit5d1463745aa4389c8ab1940e9b2d523decc9e22d
tree8431c7ed516ea3cc282d27105bb8645e53c985b2
parent7828bb811c969ee9991d5efe04e1093ce200882f
parent05cf6ff47aa144412dc8196afa26103320cdc03a
Merge remote branch 'origin/1.3'

Conflicts:
share/qtcreator/translations/qtcreator_ru.ts
share/qtcreator/translations/qtcreator_ru.ts