You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by st...@apache.org on 2015/02/13 02:05:46 UTC
[3/5] cordova-lib git commit: Merge branch 'master' into CB-8416
Merge branch 'master' into CB-8416
Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/0d0279c8
Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/0d0279c8
Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/0d0279c8
Branch: refs/heads/master
Commit: 0d0279c84c82bb2aa79a8a116184b4f43617c0cb
Parents: adab8c9 0ee180c
Author: Steve Gill <st...@gmail.com>
Authored: Fri Feb 6 12:32:30 2015 -0800
Committer: Steve Gill <st...@gmail.com>
Committed: Fri Feb 6 12:32:30 2015 -0800
----------------------------------------------------------------------
.../spec-plugman/install-browserify.spec.js | 2 +-
cordova-lib/spec-plugman/install.spec.js | 2 +-
.../spec-plugman/platforms/android.spec.js | 227 +++++++++----------
.../org.test.plugins.dummyplugin/extra.gradle | 1 +
.../plugin-lib/AndroidManifest.xml | 5 +
.../plugin-lib/libFile | 1 +
.../plugin-lib/project.properties | 1 +
.../org.test.plugins.dummyplugin/plugin.xml | 3 +
.../projects/android_install/local.properties | 1 +
.../projects/android_one/project.properties | 4 +
.../projects/android_uninstall/local.properties | 1 +
.../spec-plugman/uninstall-browserify.spec.js | 2 +-
cordova-lib/spec-plugman/uninstall.spec.js | 30 +--
cordova-lib/src/cordova/compile.js | 6 +-
cordova-lib/src/cordova/platform.js | 10 +-
cordova-lib/src/plugman/install.js | 16 +-
cordova-lib/src/plugman/platforms/android.js | 70 +++---
cordova-lib/src/plugman/util/action-stack.js | 14 +-
cordova-lib/src/plugman/util/android-project.js | 47 +++-
19 files changed, 246 insertions(+), 197 deletions(-)
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org