linphone-android/src
Sylvain Berfini d320195dd8 Merge remote-tracking branch 'private/belle-sip'
Conflicts:
	Makefile
	submodules/externals/exosip
2013-07-29 16:07:37 +02:00
..
org/linphone Merge remote-tracking branch 'private/belle-sip' 2013-07-29 16:07:37 +02:00