Merge branch 'master' of belledonne-communications.com:linphone-private

Browse source

Conflicts:
	mediastreamer2
	oRTP

...

This commit is contained in:

Simon Morlat 2010-02-08 15:38:39 +01:00

parent 74e2374984 422a811d52

commit 0998d6cd4d

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