You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by bo...@apache.org on 2012/05/08 00:57:57 UTC

[5/18] android commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cordova-android

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/CordovaWebView
Commit: d38dd4c13110b8da85d1a6f0b5b0503c61197b13
Parents: 84aaf02 269b90a
Author: Joe Bowser <bo...@apache.org>
Authored: Mon May 7 15:25:23 2012 -0700
Committer: Joe Bowser <bo...@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(-)
----------------------------------------------------------------------