Merge remote branch 'origin/2.0'

Browse Source

Conflicts:
	src/plugins/texteditor/texteditoractionhandler.cpp

...

This commit is contained in:

con

2010-05-11 13:39:21 +02:00

parent 17fd33bdab 626221b685

commit 3922be1b2e

84 changed files with 2578 additions and 1717 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

801

doc/qtcreator.qdoc

File diff suppressed because it is too large Load Diff