summaryrefslogtreecommitdiffstats
path: root/README.md
diff options
context:
space:
mode:
authorJack Humbert <jack.humb@gmail.com>2016-04-26 19:48:36 +0200
committerJack Humbert <jack.humb@gmail.com>2016-04-26 19:48:36 +0200
commitc37d52d2137acf5739c481cc0c8917ad6fd77161 (patch)
tree2fdaf2f195094efbd9fe0680579cf85602e5584c /README.md
parent0edc7a9d87ecbbce580cbbd0b0fffaad24f37f83 (diff)
parent27e3294909175dea1ae8618cace8f50d33e1dc98 (diff)
downloadqmk_firmware-c37d52d2137acf5739c481cc0c8917ad6fd77161.tar.gz
qmk_firmware-c37d52d2137acf5739c481cc0c8917ad6fd77161.tar.xz
resolves conflicts in rgblight.c
# Conflicts: # quantum/rgblight.c
Diffstat (limited to 'README.md')
-rw-r--r--README.md6
1 files changed, 4 insertions, 2 deletions
diff --git a/README.md b/README.md
index 749c97c8f..d20557f59 100644
--- a/README.md
+++ b/README.md
@@ -1,11 +1,13 @@
-# Quantum MK Firmware
+# Quantum Mechanical Keyboard Firmware
-This is a keyboard firmware based on the [tmk_keyboard firmware](http://github.com/tmk/tmk_keyboard) with some useful features for Atmel AVR controllers, and more specifically, the [OLKB product line](http://olkb.co) and the [ErgoDox EZ](http://www.ergodox-ez.com) keyboard.
+This is a keyboard firmware based on the [tmk_keyboard firmware](http://github.com/tmk/tmk_keyboard) with some useful features for Atmel AVR controllers, and more specifically, the [OLKB product line](http://olkb.co), the [ErgoDox EZ](http://www.ergodox-ez.com) keyboard, and the [Clueboard product line](http://clueboard.co/).
QMK is developed and maintained by Jack Humbert of OLKB with contributions from the community, and of course, TMK.
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).
+The OLKB product firmwares are maintained by Jack, the Ergodox EZ by Erez, and the Clueboard by [skullydazed](/skullydazed).
+
## Important background info: TMK documentation
The documentation below explains QMK customizations and elaborates on some of the more useful features of TMK. To understand the base firmware, and especially what *layers* are and how they work, please see [TMK_README.md](/TMK_README.md).