Merge branch 'dev' (early part)
Conflicts:
RELEASENOTES.md
plugin.xml
Project:
http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/repo
Commit:
http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/commit/c0c91d02
Tree:
http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/tree/c0c91d02
Diff:
http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/diff/c0c91d02
Branch: refs/heads/master
Commit: c0c91d0245237d43f28c0ee5c1ac2a6f076bbb1b
Parents: 3c36ee1 4d2c873
Author: Andrew Grieve <[email protected]>
Authored: Fri Feb 28 16:30:24 2014 -0500
Committer: Andrew Grieve <[email protected]>
Committed: Fri Feb 28 16:30:24 2014 -0500
----------------------------------------------------------------------
NOTICE | 8 +++
RELEASENOTES.md | 11 ++++
doc/index.md | 50 ++++++++++++-----
plugin.xml | 4 +-
src/android/FileTransfer.java | 38 +++++++++----
src/ios/CDVFileTransfer.h | 6 +-
src/ios/CDVFileTransfer.m | 109 ++++++++++++++++++++++---------------
src/wp/FileTransfer.cs | 2 +-
www/FileTransfer.js | 3 +-
9 files changed, 159 insertions(+), 72 deletions(-)
----------------------------------------------------------------------
