summaryrefslogtreecommitdiff
path: root/readme.md
diff options
context:
space:
mode:
authormilestogo <milestogo@users.noreply.github.com>2017-02-12 21:24:55 -0800
committermilestogo <milestogo@users.noreply.github.com>2017-02-12 21:24:55 -0800
commit1622d7147b1647a7e0da47386c919a5a95cd1a29 (patch)
tree8784b3400e87b6134316844b0111c35e8b8af9c5 /readme.md
parent2d655b18303620efc8eeb8529274a106cd438fd8 (diff)
parent4010360912125c120904e2d5294963db2d4ded65 (diff)
:
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
Diffstat (limited to 'readme.md')
-rw-r--r--readme.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/readme.md b/readme.md
index 71f7566672..21bb79a49d 100644
--- a/readme.md
+++ b/readme.md
@@ -1,6 +1,6 @@
# Quantum Mechanical Keyboard Firmware
-[![Build Status](https://travis-ci.org/jackhumbert/qmk_firmware.svg?branch=master)](https://travis-ci.org/jackhumbert/qmk_firmware) [![Gitter](https://badges.gitter.im/qmk/qmk_firmware.svg)](https://gitter.im/qmk/qmk_firmware?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
+[![Build Status](https://travis-ci.org/qmk/qmk_firmware.svg?branch=master)](https://travis-ci.org/jackhumbert/qmk_firmware) [![Gitter](https://badges.gitter.im/qmk/qmk_firmware.svg)](https://gitter.im/qmk/qmk_firmware?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
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.com), the [ErgoDox EZ](http://www.ergodox-ez.com) keyboard, and the [Clueboard product line](http://clueboard.co/).