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/04/08 22:03:21 UTC
[2/2] git commit: resolve merge issues
resolve merge issues
Project: http://git-wip-us.apache.org/repos/asf/cordova-windows/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-windows/commit/a3d0be20
Tree: http://git-wip-us.apache.org/repos/asf/cordova-windows/tree/a3d0be20
Diff: http://git-wip-us.apache.org/repos/asf/cordova-windows/diff/a3d0be20
Branch: refs/heads/master
Commit: a3d0be2011a7f02dd9e6551974a41a1b261367be
Parents: c4dabc9 599a78b
Author: Jesse MacFadyen <pu...@gmail.com>
Authored: Tue Apr 8 13:03:02 2014 -0700
Committer: Jesse MacFadyen <pu...@gmail.com>
Committed: Tue Apr 8 13:03:02 2014 -0700
----------------------------------------------------------------------
windows8/template/cordova/lib/build.js | 30 ++++++++---------------------
1 file changed, 8 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-windows/blob/a3d0be20/windows8/template/cordova/lib/build.js
----------------------------------------------------------------------