Merge branch 'stable'

Browse Source

Conflicts:
	src/qt-1-cherrypicks.patch

...

This commit is contained in:

Mark Brand 2012-09-20 10:43:06 +02:00

parent dc41e0a86d c934bf5807

commit a9602274b7

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

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

Diff Content Not Available