You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by an...@apache.org on 2014/04/24 23:36:16 UTC

[6/6] js commit: Merge branch 'master' into browserify

Merge branch 'master' into browserify


Project: http://git-wip-us.apache.org/repos/asf/cordova-js/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-js/commit/58812ae8
Tree: http://git-wip-us.apache.org/repos/asf/cordova-js/tree/58812ae8
Diff: http://git-wip-us.apache.org/repos/asf/cordova-js/diff/58812ae8

Branch: refs/heads/browserify
Commit: 58812ae8f105c98392c687d0e51efd050bebd59c
Parents: bcd2ae8 5a38908
Author: Anis Kadri <an...@apache.org>
Authored: Thu Apr 24 11:27:35 2014 -0700
Committer: Anis Kadri <an...@apache.org>
Committed: Thu Apr 24 11:27:35 2014 -0700

----------------------------------------------------------------------
 src/common/base64.js     | 10 +++++
 src/ios/exec.js          | 99 ++++++++++++++++++++++++-------------------
 src/ubuntu/platform.js   |  2 +
 src/windows8/platform.js |  6 +--
 src/windowsphone/exec.js |  2 +-
 test/test.base64.js      | 14 ++++++
 6 files changed, 85 insertions(+), 48 deletions(-)
----------------------------------------------------------------------