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 d5b34263cd

commit dd54722176

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 is not available