Commit graph

8 commits

Author SHA1 Message Date
Simon Morlat
ec6f061ea7 Merge branch 'master' into dev_sal
Conflicts:
	coreapi/address.c
	coreapi/linphonecore.c
2010-03-03 16:16:16 +01:00
Simon Morlat
a08cf146dd add jni to EXTRA_DIST 2010-02-23 16:56:52 +01:00
Simon Morlat
0267c3213f work in progress 2010-02-01 18:30:15 +01:00
Simon Morlat
f5c4c989ad api rationalisation of payload type. 2010-01-28 12:34:21 +01:00
Simon Morlat
5f0a6d55d9 sal is code complete ! 2010-01-27 16:20:03 +01:00
Simon Morlat
df89bafa70 work in progress, new layout 2010-01-22 12:26:25 +01:00
Simon Morlat
1be210a995 Merge branch 'master' into dev_sal 2010-01-20 17:08:28 +01:00
Simon Morlat
999d216d7c purge out p2pproxy 2010-01-20 15:44:30 +01:00
Renamed from linphone/coreapi/Makefile.am (Browse further)