Merge remote-tracking branch 'origin/master'

Browse Source

Conflicts:
	src/raster/rotate.cpp

...

This commit is contained in:

David Capello 2012-01-01 23:11:44 -03:00

parent 07edcdb1e2 62df7c0b60

commit 9320dca214

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