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 01:54:08 UTC
[12/12] 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/f37d6a6f
Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/f37d6a6f
Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/f37d6a6f
Branch: refs/heads/CB-8416
Commit: f37d6a6f1149fdc554d9e7e2179c2a7f028ef9ca
Parents: e539aa5 37567da
Author: Steve Gill <st...@gmail.com>
Authored: Thu Feb 12 16:53:50 2015 -0800
Committer: Steve Gill <st...@gmail.com>
Committed: Thu Feb 12 16:53:50 2015 -0800
----------------------------------------------------------------------
.../spec-plugman/platforms/windows.spec.js | 419 ++++++++++++++
.../spec-plugman/platforms/windows8.spec.js | 137 -----
.../org.test.plugins.dummyplugin/plugin.xml | 22 +-
.../src/windows/dummer.js | 1 +
.../src/windows/dummy1.dll | 0
.../src/windows/dummy1.vcxproj | 7 +
.../src/windows/dummy2.dll | 0
.../src/windows/dummy2.vcxproj | 7 +
.../src/windows/dummy3.dll | 0
.../src/windows/dummy3.vcxproj | 7 +
.../src/windows/dummy4.dll | 0
.../src/windows/dummy4.vcxproj | 7 +
.../src/windows8/dummer.js | 1 -
.../org.test.plugins.faultyplugin/plugin.xml | 14 +-
.../src/windows/faultyPlugin.js | 1 +
.../src/windows8/faultyPlugin.js | 1 -
.../projects/windows/CordovaApp.Phone.jsproj | 99 ++++
.../projects/windows/CordovaApp.Windows.jsproj | 99 ++++
.../windows/CordovaApp.Windows80.jsproj | 93 ++++
.../projects/windows/CordovaApp.projitems | 32 ++
.../projects/windows/CordovaApp.shproj | 30 +
.../projects/windows/CordovaApp.sln | 134 +++++
.../projects/windows/CordovaApp.vs2012.sln | 64 +++
.../windows/CordovaApp_TemporaryKey.pfx | Bin 0 -> 2544 bytes
.../spec-plugman/projects/windows/VERSION | 1 +
.../spec-plugman/projects/windows/config.xml | 14 +
.../projects/windows/package.phone.appxmanifest | 57 ++
.../windows/package.windows.appxmanifest | 58 ++
.../windows/package.windows80.appxmanifest | 50 ++
cordova-lib/src/PluginInfo.js | 9 +-
cordova-lib/src/cordova/platform.js | 56 +-
cordova-lib/src/cordova/plugin.js | 23 +
cordova-lib/src/cordova/util.js | 18 +-
cordova-lib/src/plugman/platforms/windows.js | 52 +-
cordova-lib/src/util/windows/jsproj.js | 309 -----------
cordova-lib/src/util/windows/jsprojManager.js | 544 +++++++++++++++++++
36 files changed, 1866 insertions(+), 500 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/f37d6a6f/cordova-lib/src/PluginInfo.js
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org