github/cordova-android
github/cordova-android
3
0
Fork 1
mirror of https://github.com/apache/cordova-android.git synced 2025-02-20 23:56:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merging master into the Nitobi Github Branch

Browse Source 
Merge branch 'master' of git://github.com/sintaxi/phonegap

Conflicts:

	android/src/com/android/droidgap/DroidGap.java
This commit is contained in:
Joe Bowser 2008-12-18 15:21:04 -08:00
commit 18fd54b9c0
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
res/drawable/icon.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.1 KiB

After

Width:  |  Height:  |  Size: 5.0 KiB

6
res/values/strings.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="hello">Hello World, DroidGap</string>
<string name="app_name">Droid Gap</string>
<string name="url">http://www.infil00p.org/gap/demo</string>
<string name="hello">Hello World, PhoneGap</string>
<string name="app_name">PhoneGap</string>
<string name="url">http://phonegap.com/demo2/</string>
</resources>