Merge branch 'master' of git@github.com:bowserj/phonegap

Browse Source

Conflicts:
	android/AndroidManifest.xml

...

This commit is contained in:

Joe Bowser 2009-10-28 13:56:03 -07:00

parent 5becaa3ca4 b746779f5f

commit 11794f58aa

1 changed files with 1 additions and 1 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files