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

Browse source

Conflicts:
	mediastreamer2

...

This commit is contained in:

Guillaume Beraudo 2011-01-21 16:16:54 +01:00

parent 3f6e745654 fa1e4658bd

commit 841c6942d3

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