diff options
| author | Oswald Buddenhagen <[email protected]> | 2010-03-10 10:32:26 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <[email protected]> | 2010-03-10 10:32:26 +0100 |
| commit | 5d1463745aa4389c8ab1940e9b2d523decc9e22d (patch) | |
| tree | 8431c7ed516ea3cc282d27105bb8645e53c985b2 /src/plugins/git/settingspage.ui | |
| parent | 7828bb811c969ee9991d5efe04e1093ce200882f (diff) | |
| parent | 05cf6ff47aa144412dc8196afa26103320cdc03a (diff) | |
Merge remote branch 'origin/1.3'
Conflicts:
share/qtcreator/translations/qtcreator_ru.ts
Diffstat (limited to 'src/plugins/git/settingspage.ui')
0 files changed, 0 insertions, 0 deletions