3 commits

Author	SHA1	Message	Date
Jehan Monnier	5035992c64	Merge remote-tracking branch 'private/dev_lime' ... Conflicts: coreapi/linphonecall.c	2015-03-12 15:08:35 +01:00
Johan Pascal	f942fdeb3b	Fix merge ... and make code C90 compliant	2014-09-28 23:02:19 +02:00
Johan Pascal	8a8eb4afe1	Add Lime (Linphone Instant Message Encryption) ... - not fully functional yet.	2014-04-11 00:02:36 +02:00