Ghislain MARY
|
3020dae1e8
|
Merge branch 'master' of git.linphone.org:linphone into belle-sip
|
2013-03-20 15:49:45 +01:00 |
|
Simon Morlat
|
00632eb049
|
fix exosip dscp api detection
|
2013-03-20 12:36:13 +01:00 |
|
Jehan Monnier
|
d69d96a0ca
|
Merge remote-tracking branch 'public/master' into belle-sip
|
2013-03-15 17:50:37 +01:00 |
|
Yann Diorcet
|
bd0d64193c
|
Check upnp version
|
2013-03-15 14:16:45 +01:00 |
|
Yann Diorcet
|
8dd4ee3ee2
|
Merge branch 'master' into belle-sip
Conflicts:
build/android/common.mk
coreapi/linphonecore.h
|
2013-03-12 13:30:13 +01:00 |
|
Simon Morlat
|
42ab420ce6
|
clean message storage API
relax requirement for sqlite3
|
2013-03-09 10:37:29 +01:00 |
|
Jehan Monnier
|
dafc0c1f0c
|
Merge remote-tracking branch 'public/master' into belle-sip
Conflicts:
configure.ac
coreapi/linphonecore.h
|
2013-03-07 21:56:18 +01:00 |
|
Jehan Monnier
|
79fe5f18b7
|
better contact/nat management
|
2013-03-07 21:11:29 +01:00 |
|
Margaux Clerc
|
981e7408cf
|
add serbian translation file
update spanish file
fix remove contact
|
2013-03-07 12:42:22 +01:00 |
|
Margaux Clerc
|
c62f68350d
|
add message storage
|
2013-03-07 12:19:28 +01:00 |
|
Simon Morlat
|
74c3932ebc
|
change: on mac, use macport's gtk-osx-application instead of ige-mac-integration.
|
2013-03-06 15:02:34 +01:00 |
|
Jehan Monnier
|
7ac3735bde
|
make sure exosip is optionnal
|
2013-02-27 11:25:04 +01:00 |
|
Jehan Monnier
|
0242451dde
|
Merge remote-tracking branch 'public/master' into belle-sip
Conflicts:
coreapi/linphonecore.c
coreapi/proxy.c
mediastreamer2
|
2013-02-18 16:15:12 +01:00 |
|
Yann Diorcet
|
5017c6ebba
|
Improve uPnP behaviour (Firewall policy change, local ip change, ...)
Hide uPnP firewall setting if uPnP is not available
|
2013-02-18 11:59:37 +01:00 |
|
Jehan Monnier
|
607af68f42
|
add upnp status to configure.ac
|
2013-02-13 16:53:54 +01:00 |
|
Jehan Monnier
|
427ec85ce4
|
Merge remote-tracking branch 'public/master' into belle-sip
Conflicts:
configure.ac
coreapi/sal.c
coreapi/sal.h
|
2013-02-06 10:55:57 +01:00 |
|
Yann Diorcet
|
66b5069dff
|
Clean configure.ac
|
2013-01-31 16:31:54 +01:00 |
|
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 |
|
Yann Diorcet
|
ee49cc9029
|
Merge branch 'master' of git://git.linphone.org/linphone into belle-sip
|
2013-01-21 12:08: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 |
|
Jehan Monnier
|
a3ca75f90f
|
Merge remote-tracking branch 'public/master' into belle-sip
|
2013-01-08 09:23:10 +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 |
|
Jehan Monnier
|
1f9453fea6
|
Merge remote-tracking branch 'public/master' into belle-sip
Conflicts:
.cproject
.project
Makefile.am
configure.ac
coreapi/Makefile.am
coreapi/callbacks.c
coreapi/linphonecore.c
|
2012-12-19 11:13:52 +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 |
|
Jehan Monnier
|
9e6f05e470
|
first belle_sip implementation
|
2012-03-30 18:11:36 +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 |
|