cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ste...@apache.org
Subject [4/4] git commit: fixed merge issue
Date Mon, 19 Aug 2013 22:02:10 GMT
fixed merge issue


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/f6c47216
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/tree/f6c47216
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/diff/f6c47216

Branch: refs/heads/dev
Commit: f6c4721607cb2d98f27bd77015b75f0db47aa4ba
Parents: 659639f 6a6adad
Author: Steven Gill <stevengill97@gmail.com>
Authored: Mon Aug 19 15:01:27 2013 -0700
Committer: Steven Gill <stevengill97@gmail.com>
Committed: Mon Aug 19 15:01:27 2013 -0700

----------------------------------------------------------------------
 LICENSE                             | 202 +++++++++++++++++++++++++++++++
 README.md                           |   2 +-
 plugin.xml                          |  17 +--
 src/android/FileProgressResult.java |   2 +-
 src/android/FileTransfer.java       |   6 +-
 src/android/FileUploadResult.java   |   2 +-
 src/ios/CDVFileTransfer.h           |   6 +-
 src/ios/CDVFileTransfer.m           |  22 ++--
 8 files changed, 232 insertions(+), 27 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/blob/f6c47216/plugin.xml
----------------------------------------------------------------------
diff --cc plugin.xml
index acd24d9,dd81853..bb36fa9
--- a/plugin.xml
+++ b/plugin.xml
@@@ -1,14 -1,15 +1,15 @@@
  <?xml version="1.0" encoding="UTF-8"?>
  
- <plugin xmlns="http://cordova.apache.org/ns/plugins/1.0"
-            id="org.apache.cordova.core.file-transfer"
-       version="0.1.0">
+ <plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
+     xmlns:android="http://schemas.android.com/apk/res/android"
+     id="org.apache.cordova.core.file-transfer"
+     version="0.2.0">
      <name>File Transfer</name>
      <description>Cordova File Transfer Plugin</description>
-     <license>Apache</license>
+     <license>Apache 2.0</license>
      <keywords>cordova,file,transfer</keywords>
  
 -    <dependency id="org.apache.cordova.core.file" url="https://git-wip-us.apache.org/repos/asf/cordova-plugin-file"
commit="master" subdir="/*" />
 +    <dependency id="org.apache.cordova.core.file" url="https://git-wip-us.apache.org/repos/asf/cordova-plugin-file"
commit="master" />
  
      <js-module src="www/FileTransferError.js" name="FileTransferError">
          <clobbers target="window.FileTransferError" />


Mime
View raw message