Updated Branches: refs/heads/master 269b90ad6 -> d38dd4c13
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cordova-android Project: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/commit/d38dd4c1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/tree/d38dd4c1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/diff/d38dd4c1 Branch: refs/heads/master Commit: d38dd4c13110b8da85d1a6f0b5b0503c61197b13 Parents: 84aaf02 269b90a Author: Joe Bowser <bows...@apache.org> Authored: Mon May 7 15:25:23 2012 -0700 Committer: Joe Bowser <bows...@apache.org> Committed: Mon May 7 15:25:23 2012 -0700 ---------------------------------------------------------------------- .../templates/project/assets/www/.main.js.swp | Bin 20480 -> 0 bytes test/res/xml/cordova.xml | 16 +++++++++++- test/res/xml/plugins.xml | 20 +++++++++++++++ 3 files changed, 35 insertions(+), 1 deletions(-) ----------------------------------------------------------------------
