Merge branch 'master' of git.sv.gnu.org:/srv/git/linphone

Browse source

Conflicts:
	mediastreamer2

...

This commit is contained in:

Simon Morlat 2011-06-06 12:14:07 +02:00

parent 1d4ccb16fd 391091cead

commit 5252cdd5ac

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