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 2014/04/24 23:14:26 UTC
[28/28] git commit: Merge branch 'master' into browserify
Merge branch 'master' into browserify
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugman/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugman/commit/013adc61
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugman/tree/013adc61
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugman/diff/013adc61
Branch: refs/heads/master
Commit: 013adc61c852561810994d899692d63b65176c6c
Parents: 93c6578 8aca4cb
Author: Anis Kadri <an...@apache.org>
Authored: Thu Apr 24 14:13:08 2014 -0700
Committer: Anis Kadri <an...@apache.org>
Committed: Thu Apr 24 14:13:08 2014 -0700
----------------------------------------------------------------------
README.md | 8 ++---
RELEASENOTES.md | 6 ++--
spec/common.js | 2 +-
spec/install.spec.js | 18 +++++------
spec/platforms/amazon-fireos.spec.js | 10 +++---
spec/platforms/common.spec.js | 2 +-
spec/platforms/ios.spec.js | 6 ++--
spec/platforms/windows8.spec.js | 2 +-
spec/platforms/wp7.spec.js | 2 +-
spec/platforms/wp8.spec.js | 2 +-
spec/plugins/Contacts/src/wp/Contacts.cs | 4 +--
spec/plugins/FaultyPlugin/plugin.xml | 4 +--
.../WebNotifications/src/ios/AppDelegate.m.diff | 2 +-
.../WebNotifications/src/ios/WebNotifications.h | 2 +-
.../WebNotifications/src/ios/WebNotifications.m | 2 +-
.../WebNotifications/www/webnotifications.js | 2 +-
.../src/blackberry10/native/public/json/value.h | 8 ++---
.../blackberry10/native/public/json/writer.h | 4 +--
.../native/public/json_batchallocator.h | 8 ++---
.../native/public/json_internalmap.inl | 2 +-
.../blackberry10/native/public/json_value.cpp | 2 +-
.../blackberry10/native/public/json_writer.cpp | 6 ++--
.../src/blackberry10/native/public/plugin.cpp | 2 +-
spec/projects/android_one/assets/www/cordova.js | 6 ++--
spec/projects/android_one/cordova/lib/cordova | 6 ++--
spec/projects/windows8/www/cordova-2.6.0.js | 6 ++--
spec/projects/windows8/www/js/index.js | 2 +-
spec/uninstall.spec.js | 34 ++++++++++----------
spec/util/config-changes.spec.js | 4 +--
spec/util/csproj.spec.js | 4 +--
src/install.js | 14 ++++----
src/platform.js | 2 +-
src/platforms/common.js | 4 +--
src/platforms/firefoxos.js | 2 +-
src/platforms/ios.js | 2 +-
src/platforms/windows8.js | 6 ++--
src/platforms/wp8.js | 2 +-
src/prepare.js | 2 +-
src/registry/manifest.js | 13 ++++++++
src/registry/registry.js | 2 +-
src/uninstall.js | 34 ++++++++++----------
src/util/config-changes.js | 8 ++---
src/util/csproj.js | 8 ++---
src/util/default-engines.js | 32 +++++++++---------
src/util/dependencies.js | 2 +-
src/util/plist-helpers.js | 10 +++---
src/util/plugins.js | 4 +--
src/util/w8jsproj.js | 16 ++++-----
src/util/xml-helpers.js | 6 ++--
49 files changed, 175 insertions(+), 162 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/013adc61/src/platforms/ios.js
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/013adc61/src/prepare.js
----------------------------------------------------------------------