Merge branch 'master' of github.com:phonegap/phonegap-android

Conflicts: framework/res/xml/phonegap.xml framework/src/com/phonegap/DroidGap.java
2026-05-30 00:00:04 +08:00 · 2011-10-14 15:43:13 -07:00
parent 97faebda41 7ee04ebf31
commit 5faed8378c
127 changed files with 14140 additions and 7433 deletions
@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <phonegap>
    <access origin="http://127.0.0.1*"/>
+<<<<<<< HEAD
+=======
+    <log level="DEBUG"/>
+>>>>>>> 7ee04ebf313c7403cf623a1f9c00b6b5e7cc9f0b
 </phonegap>