Merge remote branch 'origin/2.0'

Browse Source

Conflicts:
	doc/qt-html-templates.qdocconf

...

This commit is contained in:

con

2010-06-11 16:40:10 +02:00

parent 30fae3eab1 9250d0007d

commit 308d8c363f

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

Diff Content Not Available