aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher Browne <cbbrowne@ca.afilias.info>2016-06-22 16:42:58 -0400
committerChristopher Browne <cbbrowne@ca.afilias.info>2016-06-22 16:42:58 -0400
commit7eee1526bdf035ddb8abc3c7d189f0e84c50cc31 (patch)
tree215d6695ae484a7db5f5b3c2fae03318a65af2a5
parentb0caf32741cf415a45333828f1661d9f6b72570f (diff)
parent935f0de55d9aea64374ac277f839ba94b34264eb (diff)
downloadfirmware-7eee1526bdf035ddb8abc3c7d189f0e84c50cc31.tar.gz
firmware-7eee1526bdf035ddb8abc3c7d189f0e84c50cc31.tar.bz2
firmware-7eee1526bdf035ddb8abc3c7d189f0e84c50cc31.zip
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
-rw-r--r--README.md3
1 files changed, 2 insertions, 1 deletions
diff --git a/README.md b/README.md
index f6e0daa8e..23c879c57 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,7 @@
-[![Build Status](https://travis-ci.org/jackhumbert/qmk_firmware.svg?branch=master)](https://travis-ci.org/jackhumbert/qmk_firmware)
# Quantum Mechanical Keyboard Firmware
+[![Build Status](https://travis-ci.org/jackhumbert/qmk_firmware.svg?branch=master)](https://travis-ci.org/jackhumbert/qmk_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), 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. In fact, this repo used to be a fork of TMK, 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, both the firmware and the person. :)