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/04 20:50:09 UTC

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

Updated Branches:
  refs/heads/CordovaWebView f4cf2cecb -> 5abe8dd50


Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cordova-android into CordovaWebView


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/5abe8dd5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/tree/5abe8dd5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/diff/5abe8dd5

Branch: refs/heads/CordovaWebView
Commit: 5abe8dd5063484ce0af3d03bebbd13096bbb83a7
Parents: e4119f3 e2d91c2
Author: Joe Bowser <bo...@apache.org>
Authored: Fri May 4 11:49:48 2012 -0700
Committer: Joe Bowser <bo...@apache.org>
Committed: Fri May 4 11:49:48 2012 -0700

----------------------------------------------------------------------
 VERSION                                            |    2 +-
 .../templates/project/assets/www/index.html        |    2 +-
 framework/assets/js/cordova.android.js             |  253 ++++++++-------
 framework/assets/www/index.html                    |    2 +-
 framework/src/org/apache/cordova/Device.java       |    2 +-
 5 files changed, 147 insertions(+), 114 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/5abe8dd5/framework/src/org/apache/cordova/Device.java
----------------------------------------------------------------------