update linphone with upnp bug

This commit is contained in:
Jehan Monnier 2013-04-10 11:16:18 +02:00
parent d5077b96c9
commit b649dc812d
3 changed files with 3 additions and 3 deletions

@ -1 +1 @@
Subproject commit 30f5b028b4be6ac1dbdd23ab1b9fb004b6236aa2
Subproject commit a0b6520903db9681af2d9832fd222d6469a4f20b

View file

@ -4,11 +4,11 @@
<classpathentry kind="src" path="gen"/>
<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
<classpathentry combineaccessrules="false" kind="src" path="/Linphone-Android-NewUI"/>
<classpathentry kind="lib" path="libs/robotium-solo-3.6.jar">
<attributes>
<attribute name="javadoc_location" value="jar:platform:/resource/Linphone-Android-NewUI-Tests/libs/robotium-solo-3.6-javadoc.jar!/"/>
</attributes>
</classpathentry>
<classpathentry combineaccessrules="false" kind="src" path="/linphone-android-private"/>
<classpathentry kind="output" path="bin/classes"/>
</classpath>

View file

@ -25,7 +25,7 @@ import org.apache.http.params.HttpProtocolParams;
import org.apache.http.protocol.HTTP;
import org.linphone.LinphoneActivity;
import org.linphone.R;
import org.linphone.core.Log;
import org.linphone.mediastream.Log;
import android.content.SharedPreferences;
import android.preference.PreferenceManager;