cordova-android/framework/res/xml/phonegap.xml
Anis Kadri 5faed8378c Merge branch 'master' of github.com:phonegap/phonegap-android
Conflicts:
	framework/res/xml/phonegap.xml
	framework/src/com/phonegap/DroidGap.java
2011-10-14 15:43:13 -07:00

9 lines
198 B
XML

<?xml version="1.0" encoding="utf-8"?>
<phonegap>
<access origin="http://127.0.0.1*"/>
<<<<<<< HEAD
=======
<log level="DEBUG"/>
>>>>>>> 7ee04ebf313c7403cf623a1f9c00b6b5e7cc9f0b
</phonegap>