diff options
| author |  James Young <xxiinophobia@yahoo.com> | 2020-02-29 12:30:38 -0800 |
|---|---|---|
| committer | James Young <xxiinophobia@yahoo.com> | 2020-02-29 12:30:38 -0800 |
| commit | cae91510dc488bf81d8497252d58014353093872 (patch) | |
| tree | a6fa437a6500af9a303b9259ae6e736946f0530c | |
| parent | 26eef35f07698d23aafae90e1c230b52e100a334 (diff) | |
| download | qmk_firmware-cae91510dc488bf81d8497252d58014353093872.tar.gz | |
Breaking Changes documentation fixes
| -rw-r--r-- | docs/breaking_changes.md | 15 | ||||
| -rw-r--r-- | readme.md | 6 |
2 files changed, 8 insertions, 13 deletions
diff --git a/docs/breaking_changes.md b/docs/breaking_changes.md index f2122ffa4..280a302ba 100644 --- a/docs/breaking_changes.md +++ b/docs/breaking_changes.md @@ -6,20 +6,21 @@ The breaking change period is when we will merge PR's that change QMK in dangero ## What has been included in past Breaking Changes? +* [2020 Feb 29](ChangeLog/20200229.md) * [2019 Aug 30](ChangeLog/20190830.md) ## When is the next Breaking Change? -The next Breaking Change is scheduled for February 29, 2020. +The next Breaking Change is scheduled for May 30, 2020. ### Important Dates -* [x] 2019 Sep 21 - `future` is created. It will be rebased weekly. -* [x] 2020 Feb 1 - `future` closed to new PR's. -* [x] 2020 Feb 1 - Call for testers. -* [x] 2020 Feb 27 - `master` is locked, no PR's merged. -* [ ] 2020 Feb 29 - Merge `future` to `master`. -* [ ] 2020 Feb 29 - `master` is unlocked. PR's can be merged again. +* [x] 2019 Feb 29 - `future` is created. It will be rebased weekly. +* [ ] 2020 May 2 - `future` closed to new PR's. +* [ ] 2020 May 2 - Call for testers. +* [ ] 2020 May 28 - `master` is locked, no PR's merged. +* [ ] 2020 May 30 - Merge `future` to `master`. +* [ ] 2020 May 30 - `master` is unlocked. PR's can be merged again. ## What changes will be included? @@ -7,12 +7,6 @@ [](https://github.com/qmk/qmk_firmware/pulse/monthly) [](https://github.com/qmk/qmk_firmware/) -# THIS IS THE FUTURE BRANCH - -Warning- This is the `future` branch of QMK Firmware. You may encounter broken code here. Please see [Breaking Changes](https://docs.qmk.fm/#/breaking_changes) for more information. - -# Original readme continues - This is a keyboard firmware based on the [tmk\_keyboard firmware](https://github.com/tmk/tmk_keyboard) with some useful features for Atmel AVR and ARM controllers, and more specifically, the [OLKB product line](https://olkb.com), the [ErgoDox EZ](https://ergodox-ez.com) keyboard, and the [Clueboard product line](https://clueboard.co). ## Documentation |