Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' of git.linphone.org:linphone-android into cleaning

Browse source 
Conflicts:
	AndroidManifest.xml
This commit is contained in:
Guillaume Beraudo 2011-02-23 16:24:10 +01:00
commit 6d38874a4b
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
AndroidManifest.xml
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.linphone"
android:versionCode="1103" android:versionName="1.1.3" android:installLocation="auto">
android:versionCode="1104" android:versionName="1.1.4" android:installLocation="auto">
<uses-sdk android:minSdkVersion="3" />
@ -143,6 +143,9 @@
<uses-permission android:name="android.permission.VIBRATE"></uses-permission>
<uses-permission android:name="android.permission.CAMERA" />
<<<<<<< HEAD
=======
>>>>>>> e7697429c4475fb5f6ddfb800d5bbce0d4c20865
<supports-screens android:smallScreens="true" android:normalScreens="true" android:largeScreens="true" android:anyDensity="true"/>
</manifest>