Merge branch 'master' of git.savannah.nongnu.org:/srv/git/linphone

Browse source

Conflicts:
	mediastreamer2

...

This commit is contained in:

Jehan Monnier 2011-01-24 14:14:01 +01:00

parent ad43778a9c 703e455e34

commit b13ee29558

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