mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-02-07 14:18:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'public/master' into 3.0.x

Browse source
This commit is contained in:
Gautier Pelloux-Prayer 2015-10-15 12:15:35 +02:00
commit 296924830c
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Settings/InAppSettings.bundle/Root.plist
View file

@ -194,7 +194,7 @@
<key>Title</key>
<string>Auto answer call immediately</string>
<key>Key</key>
<string>enable_auto_answer</string>
<string>enable_auto_answer_preference</string>
<key>DefaultValue</key>
<false/>
</dict>

4
linphone-Info.plist
View file

@ -24,7 +24,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>3.8.5</string>
<string>3.8.6</string>
<key>CFBundleURLTypes</key>
<array>
<dict>
@ -53,7 +53,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
<string>2.4</string>
<string>2.4.1</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>UIApplicationExitsOnSuspend</key>

2
submodules/belle-sip

@ -1 +1 @@
Subproject commit c2bac8d73dc2ff38aa1246a3fe5346d84acf934d
Subproject commit 1ced637855bb052f2475847c867f648338b84376

2
submodules/linphone

@ -1 +1 @@
Subproject commit 2d6dc652540660465219334312bbc40d6a2545f4
Subproject commit a95fde282a07cb1e90a2c78f81ddc1a9451375e9