You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by pu...@apache.org on 2013/03/28 18:26:17 UTC

[2/2] js commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cordova-js

Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cordova-js


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

Branch: refs/heads/master
Commit: ecd08f25c3f676c01063cc57c2e3449694b25709
Parents: 182a0e0 e6bc58f
Author: Jesse MacFadyen <pu...@gmail.com>
Authored: Thu Mar 28 10:25:56 2013 -0700
Committer: Jesse MacFadyen <pu...@gmail.com>
Committed: Thu Mar 28 10:25:56 2013 -0700

----------------------------------------------------------------------
 lib/common/plugin/FileTransfer.js      |   19 +++++++++-----
 lib/common/plugin/FileUploadOptions.js |    3 +-
 lib/scripts/plugin_loader.js           |   34 +++++++++++++++-----------
 3 files changed, 34 insertions(+), 22 deletions(-)
----------------------------------------------------------------------