From 303615a9c8ad386a7bed83d3c17bd6a616001a2c Mon Sep 17 00:00:00 2001 From: KhalilBellakrid Date: Mon, 4 Feb 2019 16:48:23 +0100 Subject: [PATCH] Take PR comments into consideration --- CONTRIBUTING.md | 8 ++++---- README.md | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index c44dacb0e2..9744dd5df0 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -39,11 +39,11 @@ this same document. candidates*. ## Release process - - Development : fixes, features are done on specific branches on developers' fork, - - Pull requests: submitted to LedgerHQ/develop with updated of CHANGELOG.md, + - Development: fixes, features are done on specific branches on developers' fork, + - Pull requests: submitted to LedgerHQ/develop with updated CHANGELOG.md, - Merge into `LedgerHQ/develop`: triggers CI builds and deploys under `x.y.z-rc-commitHash`, - - Merge into `LedgerHQ/master`: once a version is confirmed to be stable by at least by one of our clients - (Vault or Live), we bump project’s version, for this we jhave a special pull request. Once merged in + - Merge into `LedgerHQ/master`: once a version is confirmed to be stable at least by one of our clients + (Vault or Live), we bump project’s version, for this we have a special pull request. Once merged in `LedgerHQ/master` and tagged as a stable release `x.y.z`, a build and a deployment are triggered. To sum up, tags point to stable releases that are in production. **These versions should be used by any application client of libcore** diff --git a/README.md b/README.md index 551374c49b..0d7647cbcd 100644 --- a/README.md +++ b/README.md @@ -141,14 +141,14 @@ node ledger-core-samples/nodejs/tests/wallet-pool-test.js ``` ## Support -###Libcore: +### Libcore: Libcore can be built for following OSes: - MacOS: minimum supported version is `macOS 9.0`, with `x86_64` architecture, - Linux: Debian (stretch), Ubuntu and Arch are supported, with `x86_64` architecture, - Windows: 64-bit architecture is built with `MSVC` (starting from Visual Studio 15), 32-bit is built with `MinGW`, - iOS: `x86_64`, `armv7` and `arm64` architectures are supported, minimum supported version is `iOS 10.0`, - Android: `x86`, `armeabi-v7a` and `arm64-v8a` architectures are supported, minimum supported version is `Android 7 (API 24)` (Java 8 is needed). -###Bindings: +### Bindings: - NodeJS bindings: - Please use `node` with version `>=8.4.0` and `<9.0.0` (other versions are not tested (yet)), - Node-gyp is used to build native module and requires `python` with version `2.7.x`.