diff options
author | Xyverz <xyverz@gmail.com> | 2017-02-20 23:54:09 -0800 |
---|---|---|
committer | Xyverz <xyverz@gmail.com> | 2017-02-20 23:54:09 -0800 |
commit | bf6f7a623dbe4e3bba4bcc6d86ac28b842226825 (patch) | |
tree | 59ce47b0d4b21a2606e1f6d367317af8bdbd06ae /readme.md | |
parent | ca1ec7b121c973fae614e69093f40ee9ba25e629 (diff) | |
parent | 7ff41df32c29bca4e3a6efc3047b8fa93bb99b92 (diff) |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'readme.md')
-rw-r--r-- | readme.md | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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/). |