diff options
author | milestogo <milestogo@users.noreply.github.com> | 2017-03-09 00:51:30 +0100 |
---|---|---|
committer | milestogo <milestogo@users.noreply.github.com> | 2017-03-09 00:51:30 +0100 |
commit | feb858c5a9afff06ff54ec401359f8bfd5abdd73 (patch) | |
tree | cf61bfad47984bb4987540404f0ec349defbff1a /readme.md | |
parent | b5bfb5104b63766ab9a54509302a3f4b0b1d7b16 (diff) | |
parent | ffb04bad660ba7c487e4b923e4391b6c7dd5eddd (diff) | |
download | qmk_firmware-feb858c5a9afff06ff54ec401359f8bfd5abdd73.tar.gz qmk_firmware-feb858c5a9afff06ff54ec401359f8bfd5abdd73.tar.xz |
Merge branch 'master' into sculpt2
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/). |