GitHub user robpaveza opened a pull request:

    https://github.com/apache/cordova-windows/pull/76

    CB-9015: Merge windows10 support to Master

    This change merges the Windows 10 support from the 'windows10' branch into 
master.  I've also gone through and tidied up a couple of the places where 
there had been some inconsistencies.  This is tied with a cordova-js and a 
cordova-docs change, which have the related updates for Windows 10 support as 
well.

You can merge this pull request into a Git repository by running:

    $ git pull https://github.com/MSOpenTech/cordova-windows CB-9015

Alternatively you can review and apply these changes as the patch at:

    https://github.com/apache/cordova-windows/pull/76.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

    This closes #76
    
----
commit 653b7d1ff1f8b80cb53c7e2d8606da1dfddffda5
Author: Parashuram <n.parashu...@yahoo.co.in>
Date:   2015-04-28T03:10:14Z

    Added info about Windows 10 support in README

commit 0d2387d95433c62b9efdbc509a627ed7277283b4
Author: Rob Paveza <rob.pav...@microsoft.com>
Date:   2015-04-23T23:26:40Z

    CB-8923 Add support for Windows 10 platform
    
    github: closes #70

commit 89745f525e13b4f60882e6f7a1ea3e96e94b8744
Author: Rob Paveza <rob.pav...@microsoft.com>
Date:   2015-04-28T22:34:13Z

    Bugfix: Win10 - Fast fail on Hardware access

commit 32d459c0f6e380878620a39518cc37768470b339
Author: Rob Paveza <rob.pav...@microsoft.com>
Date:   2015-05-01T18:10:27Z

    Reverted change to version which added pascal casing based on CR feedback

commit eddc8f7bf74400bbbfed3344c49987d835ab10ce
Author: Jesse MacFadyen <purplecabb...@gmail.com>
Date:   2015-05-02T06:54:28Z

    fix merge conflict

commit e3071ff79a3c63459a3b9876f13bc73f586f16e5
Author: Jesse MacFadyen <purplecabb...@gmail.com>
Date:   2015-05-05T20:02:38Z

    Fix bad commit that broke run.js

commit 18e368d774e777648fc0334ad622060e5ce14504
Author: Rob Paveza <rob.pav...@microsoft.com>
Date:   2015-05-12T21:37:22Z

    Merge branch 'master' of https://github.com/apache/cordova-windows into 
windows10
    
    Conflicts:
        template/cordova/lib/prepare.js

commit 48ced3f0f1f86d1882b373cc43936ab2867dfdce
Author: Rob Paveza <rob.pav...@microsoft.com>
Date:   2015-05-12T21:43:13Z

    CB-9015: Merge Windows 10 support back to master, also reverted change
    that had changed windows-target-version preference to pascal case.  While
    this had functionally been reverted previously, documentation and unit
    tests hadn't been modified to address that.

----


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@cordova.apache.org
For additional commands, e-mail: dev-h...@cordova.apache.org

Reply via email to