Merge remote-tracking branch 'origin/master' into 0.11

Browse Source

Conflicts:
	tests/examples/camerabin2/Makefile.am

...

This commit is contained in:

Edward Hervey 2011-12-30 11:49:27 +01:00

parent c4ea888f41 81b71b65ee

commit 25ad0fe0ed

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