From 70aa573111b791ed5e615802de96c0ea81b1b0c9 Mon Sep 17 00:00:00 2001 From: "Dax T. Games" Date: Wed, 29 Jul 2020 20:39:37 -0400 Subject: [PATCH 1/3] changelog --- CHANGELOG.md | 8 +++++--- CONTRIBUTING.md | 3 ++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1a22ae205..0318c3ca3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,9 +1,11 @@ # Change Log -## 1.3.16-pre - -* fix vscode terminal errors when setting cmder fast_init=1 outside cmder [#2339](https://github.com/cmderdev/cmder/pull/2339) +## [1.3.16](https://github.com/cmderdev/cmder/tree/v1.3.16) (2020-07-29) +* Merge pull request #2358 from FloSchwalm/update-to-git-2.28 [Dax T Games] +* Merge pull request #2357 from FloSchwalm/fix-git-version-comparison [Dax T Games] +* Merge pull request #2339 from daxgames/fix_global_vars_vscode_err [Dax T Games] + ## [1.3.15](https://github.com/cmderdev/cmder/tree/v1.3.15) (2020-06-26) * Fixes #2247, fixes #2254 [#2265](https://github.com/cmderdev/cmder/pull/2265) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 816d1e433..bbf8b43f9 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,13 +1,14 @@ # How to contribute Unfortunately we all can't work on cmder every day of the year, so I have decided to write some guidelines for contributing. +B If you follow them your contribution will likely be pulled in quicker. ## Getting Started * Fork the repository on GitHub (It's that easy) -* Create a feature branch based on the development branch. +* Create a feature branch based on the `master` branch. ## Making Changes From 28c416a15c0bc079b2a8a8a864927b87ef5e6e8b Mon Sep 17 00:00:00 2001 From: "Dax T. Games" Date: Wed, 29 Jul 2020 20:41:29 -0400 Subject: [PATCH 2/3] changelog --- CHANGELOG.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0318c3ca3..89d645897 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,9 +2,14 @@ ## [1.3.16](https://github.com/cmderdev/cmder/tree/v1.3.16) (2020-07-29) -* Merge pull request #2358 from FloSchwalm/update-to-git-2.28 [Dax T Games] +### Fixes + * Merge pull request #2357 from FloSchwalm/fix-git-version-comparison [Dax T Games] * Merge pull request #2339 from daxgames/fix_global_vars_vscode_err [Dax T Games] + +### Changes + +* Merge pull request #2358 from FloSchwalm/update-to-git-2.28 [Dax T Games] ## [1.3.15](https://github.com/cmderdev/cmder/tree/v1.3.15) (2020-06-26) From 794ae2ad60b871138537ae111395550f8ada264f Mon Sep 17 00:00:00 2001 From: "Dax T. Games" Date: Wed, 29 Jul 2020 20:42:14 -0400 Subject: [PATCH 3/3] changelog --- CONTRIBUTING.md | 1 - 1 file changed, 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index bbf8b43f9..17279446e 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,7 +1,6 @@ # How to contribute Unfortunately we all can't work on cmder every day of the year, so I have decided to write some guidelines for contributing. -B If you follow them your contribution will likely be pulled in quicker.