Commit 25ad0fe0 authored by Edward Hervey's avatar Edward Hervey

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

Conflicts:
	tests/examples/camerabin2/Makefile.am
parents c4ea888f 81b71b65
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment