Simon Morlat 3f8969c949 Merge remote-tracking branch 'linphone/master' ... Conflicts: Makefile.am		2013-01-14 16:38:24 +01:00
..
android	TAG for android traces can be specified through JNI interface	2012-12-27 12:18:02 +01:00
macos	macos bundle improvement	2012-03-01 16:42:23 +01:00
openembedded	Update openembedded recipes.	2012-12-13 14:34:37 +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