cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a...@apache.org
Subject [4/5] git commit: Merge branch 'tizen' of https://github.com/gabrielschulhof/cordova-plugman
Date Tue, 18 Feb 2014 19:56:32 GMT
Merge branch 'tizen' of https://github.com/gabrielschulhof/cordova-plugman

Conflicts:
	README.md


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

Branch: refs/heads/master
Commit: 4eb4d2dc169840bdb55c13971f53acf8014ff6e8
Parents: ce8c421 72c3d46
Author: Anis Kadri <anis@apache.org>
Authored: Tue Feb 11 14:45:04 2014 -0800
Committer: Anis Kadri <anis@apache.org>
Committed: Tue Feb 11 14:45:04 2014 -0800

----------------------------------------------------------------------
 README.md                                    |  1 +
 package.json                                 |  1 +
 spec/platforms/tizen.spec.js                 | 54 +++++++++++++++++++++++
 spec/plugins/DummyPlugin/plugin.xml          |  5 +++
 spec/plugins/DummyPlugin/src/tizen/dummer.js |  0
 spec/projects/tizen/www/config.xml           |  2 +
 src/platforms.js                             |  3 +-
 src/platforms/tizen.js                       | 14 ++++++
 8 files changed, 79 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/4eb4d2dc/README.md
----------------------------------------------------------------------
diff --cc README.md
index 62f7596,1c03f48..7ac71d5
--- a/README.md
+++ b/README.md
@@@ -29,7 -29,7 +29,8 @@@ You must have `git` on your PATH to be 
  * Android
  * BlackBerry 10
  * Windows Phone (7+8)
 +* Windows 8
+ * Tizen
  
  ## Command Line Usage
      plugman help

http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/4eb4d2dc/package.json
----------------------------------------------------------------------
diff --cc package.json
index 84c862f,be25561..55198d1
--- a/package.json
+++ b/package.json
@@@ -30,10 -30,10 +30,11 @@@
      "q": "~0.9",
      "npm": "1.3.4",
      "rc": "0.3.0",
 -    "tar.gz": "0.1.1"
 +    "tar": "0.1.x",
 +    "request": "2.22.0"
    },
    "devDependencies": {
+     "temp": "0.6.x",
      "jasmine-node": "1.7.0",
      "osenv": "0.0.x"
    },


Mime
View raw message