Commit graph

8 commits

Author SHA1 Message Date
Guillaume BIENKOWSKI
354b234f9b Merge remote-tracking branch 'linphone/master'
Conflicts:
	.gitignore
	Makefile.am
	mediastreamer2
	oRTP
2013-12-10 15:58:24 +01:00
Guillaume Beraudo
fd06569c8a git ignore 2013-11-21 13:54:31 +01:00
Guillaume Beraudo
a6e81200e8 Upgrade oe recipe to 3.6.1 2013-07-17 14:01:01 +02:00
Jehan Monnier
2f80cd6ed1 ad linphone_proxy_config_get_transport 2013-03-13 13:04:59 +01:00
Guillaume Beraudo
886d80bb6d Tunnel manager. 2011-12-16 10:43:30 +01:00
Jehan Monnier
98baa615da enhance docs for proxy management 2010-10-07 16:54:26 +02:00
Simon Morlat
b8cd93ba35 enhance .gitignores 2010-05-07 21:54:23 +02:00
Simon Morlat
1dcbb7a569 restore .gitignore at the good place. 2010-01-20 22:03:37 +01:00
Renamed from linphone/.gitignore (Browse further)