Jehan Monnier dafc0c1f0c Merge remote-tracking branch 'public/master' into belle-sip ... Conflicts: configure.ac coreapi/linphonecore.h		2013-03-07 21:56:18 +01:00
..
android	liblinphone tester: add android mk and modify sources for make it works	2013-03-07 17:33:11 +01:00
macos	fix for new version of pango in macports.	2013-03-06 16:47:48 +01:00
vsx	Resample oldphone.wav to 48000Hz.	2013-03-07 16:07:34 +01:00
wince	purge out p2pproxy	2010-01-20 15:44:30 +01:00
Makefile.am	start implementing a macos bundle	2011-03-23 18:21:37 +01:00