Merge remote-tracking branch 'origin/2.6' into 2.7

Browse Source

Conflicts:
	share/qtcreator/translations/qtcreator_uk.ts

Change-Id: Idedbd2dd847e7429e5455eddabc0b7e191dcb703

...

This commit is contained in:

Oswald Buddenhagen

2013-02-22 09:45:06 +01:00

parent 4ae4f05f91 619e52ebc2

commit 27de678783

2 changed files with 14538 additions and 7141 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

8514

share/qtcreator/translations/qtcreator_cs.ts

File diff suppressed because it is too large Load Diff

13165

share/qtcreator/translations/qtcreator_uk.ts

File diff suppressed because it is too large Load Diff