summaryrefslogtreecommitdiff
path: root/readme.md
diff options
context:
space:
mode:
authorJack Humbert <jack.humb@gmail.com>2016-07-10 14:02:10 -0400
committerGitHub <noreply@github.com>2016-07-10 14:02:10 -0400
commit4081fc4d8f6a14ca553ad6d7f91507a7b9c432b3 (patch)
treeb10e3288b56ab3be6016054d56920a38d115b4e5 /readme.md
parentb0300d8d8fcb79fea48ce20e189520acd1d89d61 (diff)
parentc7728780dee32d3f5e63e13ffad44600492e45d6 (diff)
downloadqmk_firmware-4081fc4d8f6a14ca553ad6d7f91507a7b9c432b3.tar.gz
qmk_firmware-4081fc4d8f6a14ca553ad6d7f91507a7b9c432b3.zip
Merge pull request #505 from fredizzimo/documentation_fix
Remove out of place documentation, caused by ChibiOS merge
Diffstat (limited to 'readme.md')
-rw-r--r--readme.md3
1 files changed, 0 insertions, 3 deletions
diff --git a/readme.md b/readme.md
index 3657d2c15a..7f7a55c82a 100644
--- a/readme.md
+++ b/readme.md
@@ -24,9 +24,6 @@ The project also includes community support for [lots of other keyboards](/keybo
QMK is developed and maintained by Jack Humbert of OLKB with contributions from the community, and of course, [Hasu](https://github.com/tmk). This repo used to be a fork of [TMK](https://github.com/tmk/tmk_keyboard), and we are incredibly grateful for his founding contributions to the firmware. We've had to break the fork due to purely technical reasons - it simply became too different over time, and we've had to start refactoring some of the basic bits and pieces. We are huge fans of TMK and Hasu :)
This documentation is edited and maintained by Erez Zukerman of ErgoDox EZ. If you spot any typos or inaccuracies, please [open an issue](https://github.com/jackhumbert/qmk_firmware/issues/new).
-#### 2016/02/10
-core: flabbergast's Chibios protocol was merged from <https://github.com/flabbergast/tmk_keyboard/tree/chibios> (@72b1668). See [tmk_core/protocol/chibios/README.md](tmk_core/protocol/chibios/README.md). Chibios protocol supports Cortex-M such as STM32 and Kinetis.
-
The OLKB product firmwares are maintained by [Jack Humbert](https://github.com/jackhumbert), the Ergodox EZ by [Erez Zukerman](https://github.com/ezuk), and the Clueboard by [Zach White](https://github.com/skullydazed).