Commit graph

4 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
Jehan Monnier
01331f08a9 add traces + more jni implementation 2010-02-15 18:02:19 +01:00
Simon Morlat
80e14f6a90 work in progress to use SAL in coreapi 2010-01-29 23:57:46 +01:00
Simon Morlat
999d216d7c purge out p2pproxy 2010-01-20 15:44:30 +01:00
Renamed from linphone/coreapi/address.c (Browse further)