Merge branch 'master' into f18

Browse Source

Conflicts:
	cairo.spec

...

This commit is contained in:

Adam Jackson 2012-12-18 13:18:55 -05:00

parent 030ac7e907 80b55524fa

commit cadcd27399

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