You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by br...@apache.org on 2013/01/08 00:21:50 UTC
[3/3] android commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/cordova-android into file_slicing
Updated Branches:
refs/heads/master 72e0b49e0 -> 5f6824e5d
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cordova-android into file_slicing
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/5f6824e5
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/5f6824e5
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/5f6824e5
Branch: refs/heads/master
Commit: 5f6824e5dd758233924974d333857ed3fc5e33b9
Parents: 4589bdd 72e0b49
Author: Braden Shepherdson <br...@chromium.org>
Authored: Mon Jan 7 18:13:54 2013 -0500
Committer: Braden Shepherdson <br...@chromium.org>
Committed: Mon Jan 7 18:13:54 2013 -0500
----------------------------------------------------------------------
VERSION | 2 +-
bin/templates/project/assets/www/index.html | 2 +-
framework/assets/js/cordova.android.js | 8 ++++----
framework/assets/www/index.html | 2 +-
framework/src/org/apache/cordova/Device.java | 2 +-
framework/src/org/apache/cordova/InAppBrowser.java | 3 +++
6 files changed, 11 insertions(+), 8 deletions(-)
----------------------------------------------------------------------