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

Browse source

Conflicts:
	mediastreamer2

...

This commit is contained in:

Guillaume Beraudo 2011-04-06 15:15:22 +02:00

parent 0025ff06f6 e91cae19dd

commit c807039a86

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