Jehan Monnier 427ec85ce4 Merge remote-tracking branch 'public/master' into belle-sip ... Conflicts: configure.ac coreapi/sal.c coreapi/sal.h		2013-02-06 10:55:57 +01:00
..
android	Merge remote-tracking branch 'public/master' into belle-sip	2013-02-06 10:55:57 +01:00
macos	macos bundle improvement	2012-03-01 16:42:23 +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