Commit graph

94 commits

Author SHA1 Message Date
Yann Diorcet
5c939acd69 Merge branch 'upnp'
Conflicts:
	coreapi/callbacks.c
	coreapi/linphonecore.c
	gtk/Makefile.am
	mediastreamer2
2013-01-25 12:01:50 +01:00
Ghislain MARY
2c5cef3bb3 Fix library dependencies linking on Debian based systems. 2013-01-18 16:04:58 +01:00
Yann Diorcet
35d65d36f2 Merge branch 'master' of git.linphone.org:linphone into upnp
Conflicts:
	coreapi/linphone_tunnel.cc
	mediastreamer2
2013-01-17 15:34:58 +01:00
Yann Diorcet
3016ec37d0 Fix lpc2xml for old libxml version 2013-01-17 11:01:28 +01:00
Simon Morlat
5730556ca7 fix libxml compilation error 2013-01-17 09:31:35 +01:00
Ghislain MARY
69ea55ba34 Do not use deprecated autotools macros. 2013-01-16 10:38:12 +01:00
Yann Diorcet
3b20b89886 Merge branch 'master' of git.linphone.org:linphone into upnp
Conflicts:
	coreapi/linphonecore.c
	mediastreamer2
2013-01-09 13:58:33 +01:00
Guillaume Beraudo
5cae5cadeb Detect presence of DSCP in exosip 2013-01-08 16:18:16 +01:00
Margaux Clerc
361da1ab98 update translation files(de,he,ru) and fix the language choice for linux 2013-01-07 15:06:31 +01:00
Yann Diorcet
deccbd6963 Start including upnp 2012-12-19 15:41:23 +01:00
Yann Diorcet
148a0a91b5 Add XML2LPC lib/tool 2012-12-13 16:08:43 +01:00
Ghislain MARY
ae3e9911b9 Improve output of configure --help. 2012-12-11 17:10:31 +01:00
Yann Diorcet
3e7a110e01 Fix autotool warnings 2012-12-10 17:03:07 +01:00
Yann Diorcet
b31352ae9e Fix previous commit 2012-12-06 12:01:46 +01:00
Yann Diorcet
0e521c4099 Improve previous commit 2012-12-06 11:22:48 +01:00
Yann Diorcet
0e5ffe272f Improve wizard disabling with gtk < 2.22.0 2012-12-06 11:08:51 +01:00
Yann Diorcet
d998fa1a5a Improve previous commit 2012-12-06 10:56:08 +01:00
Yann Diorcet
b5e0067dda Disable wizard if gtk < 2.22.0 2012-12-06 10:39:15 +01:00
Yann Diorcet
c9af7c4715 Force AC_SUBST INTLLIBS 2012-10-09 12:59:17 +02:00
Jehan Monnier
296b5671ae add armv7s support for IOS
Conflicts:

	mediastreamer2
2012-09-18 15:54:08 +02:00
Ghislain MARY
c8be820dad Link with the two splitted mediastreamer2 libraries. 2012-09-10 14:21:41 +02:00
Simon Morlat
ae54442d0f update version number 2012-08-22 09:56:26 +02:00
Simon Morlat
a58b548331 fix version number declaration 2012-08-03 13:44:43 +02:00
Sylvain Berfini
5f2640d57a Android Makefile changed to automatically update linphone version 2012-08-02 12:45:15 +02:00
Yann Diorcet
59415aa6e4 Fix configure rtptimestamp -> ntptimestamp 2012-05-21 16:19:11 +02:00
Yann Diorcet
d39e393221 Change rtp-timestamp option to ntp-timestamp 2012-05-16 15:42:04 +02:00
Yann Diorcet
e74d43779c Add rtp timestamp configure option + debug option
Update oRTP & mediastreamer2
2012-05-15 17:08:57 +02:00
Simon Morlat
48f34568c9 implement notifications when doing transfers 2012-03-29 15:09:52 +02:00
Simon Morlat
3a8b6a943c fix mac os build (AM_GNU_GETTEXT was adding flags to CPPFLAGS) 2012-03-29 10:43:46 +02:00
Simon Morlat
b89851b1d3 implement hotpluging of usb devices for linux, and update ortp 2012-03-12 16:21:39 +01:00
Simon Morlat
4006baf289 update ortp, use eXosip_trylock() whenever possible 2012-03-05 15:06:56 +01:00
Jehan Monnier
52ec4a646d fix .cprojet
update ms2 for better audio devices handling on macosx
2012-03-01 12:20:53 +01:00
Simon Morlat
ed5df307b8 improve configure in order to disable assistant and libsoup dependency 2012-02-28 20:45:26 +01:00
Yann Diorcet
3483b5de70 Merge branch 'master' of git.linphone.org:linphone 2012-02-23 09:18:19 +01:00
Thierry Reding
161e8252ad Allow speex support to be explicitly disabled 2012-02-23 09:11:55 +01:00
Sylvain Berfini
393b958acc Linphone 3.5.2 2012-02-22 12:59:00 +01:00
Simon Morlat
1fef18d999 zrtp no more unfinished 2012-02-18 13:40:24 +01:00
Yann Diorcet
d4ee76a065 Fix compilations issue with wizard (if not wanted) 2012-02-15 16:37:57 +01:00
Simon Morlat
5ad81af695 refine tunnel implementation
- API cleanups
- add http proxy support
- add stubs to avoid using conditional defines.
2012-02-15 14:53:27 +01:00
Sylvain Berfini
38edecafcb 3.5.1 + oRTP/ZRTP branch merged 2012-02-14 11:02:22 +01:00
Jehan Monnier
7a4c75452f wizard must be optionnal, add G729 payload type 2012-02-05 11:27:09 +01:00
Sylvain Berfini
9bc489eebf Wizard merged 2012-02-01 10:34:31 +01:00
Simon Morlat
fcb343ac9b update ortp 2011-12-21 16:48:50 +01:00
Sylvain Berfini
1beff1e293 Linphone 3.5 2011-12-19 12:31:23 +01:00
Simon Morlat
4964b82f26 fix broken build (all) and update ms2 and ortp 2011-12-16 17:46:34 +01:00
Guillaume Beraudo
886d80bb6d Tunnel manager. 2011-12-16 10:43:30 +01:00
Guillaume Beraudo
26afd3a95a Depend on GTK 2.22 for wizard commit method. 2011-12-02 14:50:53 +01:00
Sylvain Berfini
be4e74d208 Wizard 2011-11-29 10:40:35 +01:00
Jehan Monnier
e6c0ee2f7c Merge remote-tracking branch 'private/dev_videoios'
Conflicts:
	mediastreamer2
2011-11-14 11:10:24 +01:00
Simon Morlat
148aca5c6b windows fixes 2011-11-08 14:56:40 +01:00