You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by pu...@apache.org on 2014/09/19 01:19:19 UTC

[4/4] git commit: Merge branch 'MRT' of https://github.com/MSOpenTech/cordova-windows

Merge branch 'MRT' of https://github.com/MSOpenTech/cordova-windows


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

Branch: refs/heads/master
Commit: eb3a468870c4181567dd2b07aa0de77700f2e486
Parents: a315941 87ba72f
Author: Jesse MacFadyen <pu...@gmail.com>
Authored: Thu Sep 18 16:18:52 2014 -0700
Committer: Jesse MacFadyen <pu...@gmail.com>
Committed: Thu Sep 18 16:18:52 2014 -0700

----------------------------------------------------------------------
 windows/template/CordovaApp.Phone.jsproj        |   7 +-
 windows/template/CordovaApp.Windows.jsproj      |   5 +-
 windows/template/CordovaApp.Windows80.jsproj    |   9 +-
 windows/template/cordova/lib/ConfigParser.js    |  82 ++-------------
 windows/template/cordova/lib/package.js         |  56 +++++-----
 windows/template/cordova/lib/prepare.js         | 103 +++++++++++++------
 windows/template/cordova/lib/run.js             |   2 +-
 .../template/images/SplashScreen.scale-100.png  | Bin 0 -> 24855 bytes
 .../template/images/SplashScreen.scale-240.png  | Bin 68705 -> 0 bytes
 .../images/SplashScreenPhone.scale-240.png      | Bin 0 -> 68705 bytes
 .../images/Square150x150Logo.scale-100.png      | Bin 0 -> 11600 bytes
 .../images/Square30x30Logo.scale-100.png        | Bin 0 -> 2831 bytes
 .../images/Square310x310Logo.scale-100.png      | Bin 0 -> 35751 bytes
 .../images/Square70x70Logo.scale-100.png        | Bin 0 -> 8361 bytes
 windows/template/images/StoreLogo.scale-100.png | Bin 0 -> 4052 bytes
 .../images/Wide310x150Logo.scale-100.png        | Bin 0 -> 12517 bytes
 windows/template/images/logo.png                | Bin 11600 -> 0 bytes
 windows/template/images/smalllogo.png           | Bin 2831 -> 0 bytes
 windows/template/images/splashscreen.png        | Bin 24855 -> 0 bytes
 windows/template/images/storelogo.png           | Bin 4052 -> 0 bytes
 windows/template/package.phone.appxmanifest     |   9 +-
 windows/template/package.windows.appxmanifest   |  17 ++-
 windows/template/package.windows80.appxmanifest |   6 +-
 23 files changed, 137 insertions(+), 159 deletions(-)
----------------------------------------------------------------------