Commit graph

1949 commits

Author SHA1 Message Date
Yann Diorcet
051d48ade5 Update linphone submodule 2013-01-16 15:38:04 +01:00
Ghislain MARY
15331b3841 Merge branch 'branch_1.x' of git.linphone.org:linphone-iphone into tunnel 2013-01-16 13:33:28 +01:00
Ghislain MARY
a98ee225a2 Update linphone submodule. 2013-01-16 12:18:53 +01:00
Ghislain MARY
ebf88e9f21 Update submodules to prevent use of deprecated autotools macros. 2013-01-16 10:44:09 +01:00
Ghislain MARY
17d93116fc Remove useless images. 2013-01-15 15:58:39 +01:00
Yann Diorcet
233f22e5d7 Merge branch 'master' into tunnel
Conflicts:
	Classes/LinphoneUI/LinphoneManager.h
	Classes/LinphoneUI/LinphoneManager.m
	Settings.bundle/Root.plist
	Settings/InAppSettings.bundle/Root.plist
	linphone.xcodeproj/project.pbxproj
	submodules/build/builders.d/x264.mk
2013-01-15 12:58:42 +01:00
Ghislain MARY
8f617b7fb5 Merge tag '2.0.2' of git.linphone.org:linphone-iphone into apple_store
2.0.2 release.
2013-01-14 14:27:28 +01:00
Ghislain MARY
e6eac4b31e One more try to increase version. 2013-01-14 13:35:28 +01:00
Yann Diorcet
17414d07e9 Add Settings label from InAppSettings FR translations 2013-01-14 13:26:37 +01:00
Yann Diorcet
e11efb11b7 Remove useless ChatData files 2013-01-14 12:53:51 +01:00
Ghislain MARY
38656d63b5 Increase short version. 2013-01-14 12:24:11 +01:00
Ghislain MARY
546fc71222 Merge tag '2.0.2' of git.linphone.org:linphone-iphone into apple_store
2.0.2 release.
2013-01-14 11:38:25 +01:00
Ghislain MARY
92d70f77e8 Increase version number. 2013-01-14 11:09:36 +01:00
Yann Diorcet
6d657edc69 Fix zrtp feature 2013-01-14 10:37:56 +01:00
Ghislain MARY
f247f395d2 Add message to tell to compile from sources to enable H.264 and mpeg4. 2013-01-11 16:13:46 +01:00
Ghislain MARY
33695f4f56 Merge branch 'master' into apple_store 2013-01-11 11:06:49 +01:00
Ghislain MARY
1b9f022fb4 Update linphone submodule. 2013-01-11 10:53:41 +01:00
Ghislain MARY
4f021a7a26 Merge branch 'branch_1.x' of git.linphone.org:linphone-iphone into tunnel 2013-01-09 14:47:07 +01:00
Ghislain MARY
12bd6891ea Update linphone submodule. 2013-01-09 14:16:06 +01:00
Ghislain MARY
cb4b9ff308 Merge branch 'branch_1.x' of git.linphone.org:linphone-iphone into tunnel 2013-01-04 09:39:42 +01:00
Ghislain MARY
39dcbf1362 Update linphone submodule. 2013-01-03 17:31:01 +01:00
Simon Morlat
e55012e884 update msx264 (required to fix VFU request) 2012-12-21 10:22:51 +01:00
Yann Diorcet
7a75f2bb8b Show organization name if there is no first name and last name 2012-12-20 14:12:47 +01:00
Yann Diorcet
7fcd50b577 Disable and hide H264 and MPEG4 2012-12-20 12:46:14 +01:00
Ghislain MARY
c0c3d29058 Merge branch 'branch_1.x' of git.linphone.org:linphone-iphone into tunnel 2012-12-20 08:46:28 +01:00
Ghislain MARY
4aa170c387 Fix x264 build. 2012-12-20 08:45:16 +01:00
Ghislain MARY
d5f6d26885 Merge branch 'branch_1.x' of git.linphone.org:linphone-iphone into tunnel 2012-12-19 11:31:27 +01:00
Ghislain MARY
ca83f0b3c2 Update x264 submodule for crash fix on iOS 6. 2012-12-19 11:29:58 +01:00
Ghislain MARY
c09975a9c1 Update linphone submodule for ICE fix. 2012-12-17 16:34:05 +01:00
Ghislain MARY
19404ff85a Update tunnel submodule to fix compilation on armv7s-apple-darwin architecture. 2012-12-17 14:13:25 +01:00
Ghislain MARY
9686dce6d3 Merge branch 'branch_1.x' of git.linphone.org:linphone-iphone into tunnel 2012-12-17 11:49:40 +01:00
Jehan Monnier
ecfe93d790 check certificate CN name 2012-12-14 09:55:12 +01:00
Jehan Monnier
3606d826e3 iTunesArtwork must be at the root directory level 2012-12-14 08:17:51 +01:00
Yann Diorcet
fa23e8a34f Merge branch 'master' of git.linphone.org:linphone-iphone 2012-12-07 11:01:43 +01:00
Yann Diorcet
6900913b59 Improve battery warning
Improve logs
2012-12-07 11:01:34 +01:00
Jehan Monnier
799a4112a0 fix missing binding for copyright label 2012-12-07 10:44:08 +01:00
Yann Diorcet
2b72e4598c Fix other flags of projects 2012-12-07 09:21:21 +01:00
Jehan Monnier
3911d21519 add missing ldbs 2012-12-07 09:20:33 +01:00
Jehan Monnier
cc0983860c improve customazation process 2012-12-06 18:26:51 +01:00
Yann Diorcet
f98a63c59a Revert "Fix XMLRPC and NinePath link"
This reverts commit 752fd59339.
2012-12-06 18:17:54 +01:00
Yann Diorcet
752fd59339 Fix XMLRPC and NinePath link 2012-12-04 13:14:12 +01:00
Yann Diorcet
b44eaec8e4 Fix project for sensitive case fs 2012-12-04 12:14:14 +01:00
Yann Diorcet
f9f2a81fe3 Update linphone submodule 2012-12-04 11:52:49 +01:00
Yann Diorcet
4d9bd6e35b Merge branch 'master' into temp 2012-12-03 17:40:49 +01:00
Yann Diorcet
ee3735c2d1 Fix profile and versions
Conflicts:
	linphone-Info.plist
2012-12-03 17:31:57 +01:00
Yann Diorcet
997eadd998 Fix profile and versions 2012-12-03 17:20:47 +01:00
Yann Diorcet
0c9f04ed81 Merge branch 'new_ui' into apple_store 2012-12-03 16:21:47 +01:00
Yann Diorcet
ffd5c0c277 Improve low battery detection and test 2012-12-03 16:21:30 +01:00
Yann Diorcet
955f96660f Increment versions 2012-12-03 16:01:56 +01:00
Yann Diorcet
7e8e2b7157 Merge branch 'new_ui' into apple_store 2012-12-03 16:00:10 +01:00