Marown/SWADroid
Marown/SWADroid
1
1
Fork 0
Code Issues 25 Pull Requests Packages Projects Releases 29 Wiki Activity

Fixed merge conflicts

Browse Source
This commit is contained in:
Juan Miguel Boyero Corral 2012-04-07 16:46:12 +02:00
parent eb1d5d5c99
commit ded647e2be
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SWADroid/AndroidManifest.xml
View File

@ -39,7 +39,7 @@
<activity android:theme="@android:style/Theme.Translucent.NoTitleBar" android:name=".modules.Messages" android:label="@string/messagesModuleLabel" android:configChanges="keyboard|keyboardHidden|orientation"></activity>
<activity android:name=".modules.notifications.NotificationItem" android:theme="@android:style/Theme.NoTitleBar" android:label="@string/notificationsModuleLabel"></activity>
<activity android:theme="@android:style/Theme.Translucent.NoTitleBar" android:name=".modules.Notices" android:label="@string/noticesModuleLabel" android:configChanges="keyboard|keyboardHidden|orientation"></activity>
</application>
<provider android:name=".sync.DummyProvider"
android:authorities="es.ugr.swad.content"

2
SWADroid/src/es/ugr/swad/swadroid/Global.java
View File

@ -27,7 +27,7 @@ public class Global {
/**
* SWAD application key
*/
private static final String AppKey = "HTC-Desire";
private static final String AppKey = "";
/**
* User logged flag
*/