diff options
| author | dbroqua <dbroqua@mousur.org> | 2016-08-23 13:39:49 +0200 |
|---|---|---|
| committer | dbroqua <dbroqua@mousur.org> | 2016-08-23 13:39:49 +0200 |
| commit | e65252d591b88f3c108d40ea5eeda9d561bc237c (patch) | |
| tree | 6e43f93f62aef905c2c5beeb46ef37a18c38e7e0 /keyboards/readme.md | |
| parent | 92fe78a5ea98cc8ca36d74ce86c24fe284729c39 (diff) | |
| parent | fb4452c2f5a80720fd56306ea4fa7c61a5e8040d (diff) | |
Merge remote-tracking branch 'upstream/master'
# Conflicts:
# keyboards/planck/keymaps/dbroqua/keymap.c
Diffstat (limited to 'keyboards/readme.md')
| -rw-r--r-- | keyboards/readme.md | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/keyboards/readme.md b/keyboards/readme.md index f6c90b1f63..4f17962191 100644 --- a/keyboards/readme.md +++ b/keyboards/readme.md @@ -39,6 +39,7 @@ These keyboards are part of the QMK repository, but their manufacturers are not * [hhkb](/keyboards/hhkb) — The Happy Hacking keyboard can be hacked with a custom controller to run QMK. * [jd45](/keyboards/jd45) — Another Geekhack community project, designed by jdcarpe. * [kc60](/keyboards/kc60) — A programmable Chinese-made keyboard, lost in the mists of time. +* [kitten_paw](/keyboards/kitten_paw) — A replacement controller (2016 revision) for the Filco Majestouch by [Bathroom Epiphanies](https://github.com/BathroomEpiphanies) * [phantom](/keyboards/phantom) — A tenkeyless kit by Teel, also from Geekhack. * [retro_refit](/keyboards/retro_refit) — Another creation by IBNobody. * [satan](/keyboards/satan) — A GH60 variant. |