Commit Graph

7 Commits

Author SHA1 Message Date
Peter Ehrlich
bdd7449af3 documentation additions 2012-01-17 16:31:08 -05:00
Joe Bowser
7840448133 Work-around Feature for Classic PhoneGap 320x480 resolution 2011-11-25 14:38:11 -08:00
Anis Kadri
ac509369e9 forgot to resolve conflict 2011-10-14 15:49:16 -07:00
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
Bryce Curtis
6a9253e928 Formalize logging with printf-type optimization. Wrap Android log facilities instead of using System.out.println(). 2011-09-28 22:19:23 -05:00
Bryce Curtis
80df4a8fb2 White list support. Pull request https://github.com/phonegap/phonegap-android/pull/211 from imhotep would not merge, so combined it with enhancements for this commit. 2011-09-26 10:58:41 -05:00
Anis Kadri
f111ea56ed whitelist support 2011-08-29 16:13:02 -07:00