Guillaume BIENKOWSKI 354b234f9b Merge remote-tracking branch 'linphone/master' ... Conflicts: .gitignore Makefile.am mediastreamer2 oRTP		2013-12-10 15:58:24 +01:00
..
android	Update Mediastreamer2	2013-11-27 16:24:59 +01:00
macos	fix macos bundle generation to take into account things from /usr/local/lib	2013-11-15 14:50:13 +01:00
openembedded	Upgrade oe recipe to 3.6.1	2013-07-17 14:01:01 +02:00
vsx	Some changes to only use API allowed for WP8 applications.	2013-07-19 11:39:21 +02:00
wince	purge out p2pproxy	2010-01-20 15:44:30 +01:00
Makefile.am	Upgrade oe recipe to 3.6.1	2013-07-17 14:01:01 +02:00