Merge branch 'video' of git.linphone.org:linphone-android-private into video

Browse source

Conflicts:
	submodules/linphone

...

This commit is contained in:

Guillaume Beraudo 2010-12-09 09:15:53 +01:00

parent 1c113d3074 2a4740e275

commit bf1f74e33f

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