14 commits

Author	SHA1	Message	Date
Benjamin Reis	e1fb16defa	rearrange files	2017-08-14 15:42:03 +02:00
Benjamin Reis	6a90b6371e	merge master	2017-08-10 14:21:20 +02:00
Benjamin Reis	8272134d35	allow abstract participant arch to localConference	2017-08-07 11:56:54 +02:00
Benjamin Reis	23f4d851f1	better use of memory	2017-08-07 11:22:56 +02:00
Benjamin Reis	bbd08f3aaf	fix merge	2017-08-04 14:44:10 +02:00
Benjamin Reis	cf86a35a48	Merge remote-tracking branch 'origin/master' into dev_conference_info	2017-08-04 14:31:20 +02:00
Benjamin Reis	fc02978435	create the conf event notify + tests	2017-08-04 14:24:08 +02:00
Erwan Croze	7f1414a600	Fix Android build	2017-08-04 09:46:08 +02:00
Ronan Abhamon	e61c25be5e	feat(utils): add stoi function	2017-08-04 09:35:10 +02:00
Ronan Abhamon	44de032c86	feat(core): add a Cpim parser	2017-08-03 14:39:15 +02:00
Benjamin Reis	d77af88558	use shared_ptr	2017-08-02 15:06:00 +02:00
Benjamin Reis	cc49b6f53a	add subscribe to conf event api	2017-08-01 13:28:41 +02:00
Ronan Abhamon	8f64595659	feat(object): rename Linphone namespace to LinphonePrivate	2017-07-27 14:07:56 +02:00
Ronan Abhamon	ed69bd4505	feat(app): add new source folder with object base	2017-07-26 13:24:02 +02:00