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

Browse source

Conflicts:
	mediastreamer2

...

This commit is contained in:

Jehan Monnier 2010-09-13 23:41:09 +02:00

parent dfa388b304 dbb43a0069

commit 55aa245f04

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