github/cordova-android
3
0
Fork 1
mirror of https://github.com/apache/cordova-android.git synced 2026-05-30 00:00:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 4.0.x (up to 3.7.0-dev)

Browse Source 
Conflicts:
	VERSION
	bin/templates/cordova/version
	framework/src/org/apache/cordova/CordovaWebView.java
	package.json
	test/src/org/apache/cordova/test/basicauth.java
	test/src/org/apache/cordova/test/menus.java
This commit is contained in:
Ian Clelland
2014-09-11 10:16:28 -04:00
parent 31b1a821ca 5a82dd5110
commit 51e634ccb4
7 changed files with 210 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
package.json
+27 -27
View File
@@ -1,29 +1,29 @@
{
"name": "cordova-android",
"version": "4.0.0-dev",
"description": "cordova-android release",
"main": "bin/create",
"repository": {
"type": "git",
"url": "https://git-wip-us.apache.org/repos/asf/cordova-android.git"
},
"keywords": [
"android",
"cordova",
"apache"
],
"scripts": {
"test": "jasmine-node --color spec"
},
"author": "Apache Software Foundation",
"license": "Apache version 2.0",
"dependencies": {
"q": "^0.9.0",
"shelljs": "^0.2.6",
"which": "^1.0.5"
},
"devDependencies": {
"jasmine-node": "~1",
"promise-matchers": "~0"
}
"name": "cordova-android",
"version": "4.0.0-dev",
"description": "cordova-android release",
"main": "bin/create",
"repository": {
"type": "git",
"url": "https://git-wip-us.apache.org/repos/asf/cordova-android.git"
},
"keywords": [
"android",
"cordova",
"apache"
],
"scripts": {
"test": "jasmine-node --color spec"
},
"author": "Apache Software Foundation",
"license": "Apache version 2.0",
"dependencies": {
"q": "^0.9.0",
"shelljs": "^0.2.6",
"which": "^1.0.5"
},
"devDependencies": {
"jasmine-node": "~1",
"promise-matchers": "~0"
}
}