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 2013/09/25 16:47:54 UTC
[3/3] git commit: Merge branch 'dev' of
https://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer into dev
Merge branch 'dev' of https://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer into dev
Conflicts:
www/windows8/FileTransferProxy.js
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/ba3f9ddd
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/tree/ba3f9ddd
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/diff/ba3f9ddd
Branch: refs/heads/dev
Commit: ba3f9dddbf2c7679297247c3e23610eb78199f76
Parents: 93d8bfc ae3caf4
Author: Anis Kadri <an...@apache.org>
Authored: Wed Sep 25 16:47:36 2013 +0200
Committer: Anis Kadri <an...@apache.org>
Committed: Wed Sep 25 16:47:36 2013 +0200
----------------------------------------------------------------------
www/windows8/FileTransferProxy.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/blob/ba3f9ddd/www/windows8/FileTransferProxy.js
----------------------------------------------------------------------