Merge remote-tracking branch 'origin/3.3.x'

This commit is contained in:
Sylvain Berfini 2018-01-22 12:28:16 +01:00
commit 34b91f5ae1
2 changed files with 5 additions and 5 deletions

View file

@ -2,8 +2,8 @@
<manifest package="org.linphone" <manifest package="org.linphone"
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:installLocation="auto" android:installLocation="auto"
android:versionCode="3311" android:versionCode="3320"
android:versionName="3.3.1"> android:versionName="3.3.2">
<uses-sdk <uses-sdk
android:minSdkVersion="16" android:minSdkVersion="16"
@ -359,4 +359,4 @@
<activity android:name=".LinphoneGenericActivity"> <activity android:name=".LinphoneGenericActivity">
</activity> </activity>
</application> </application>
</manifest> </manifest>

View file

@ -2,8 +2,8 @@
<manifest package="org.linphone.core" <manifest package="org.linphone.core"
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:installLocation="auto" android:installLocation="auto"
android:versionCode="3311" android:versionCode="3320"
android:versionName="3.3.1"> android:versionName="3.3.2">
<uses-sdk <uses-sdk
android:minSdkVersion="16" android:minSdkVersion="16"