Commit graph

3 commits

Author SHA1 Message Date
Sandrine Avakian
d4ff86db9d License update. 2016-06-17 14:53:59 +02:00
Simon Morlat
3f8969c949 Merge remote-tracking branch 'linphone/master'
Conflicts:
	Makefile.am
2013-01-14 16:38:24 +01:00
Simon Morlat
2c5601b0f2 add missing files 2012-12-12 14:10:20 +01:00