From: Oleg Kostyuk <cub.uanic@gmail.com>
Date: Tue, 10 Feb 2015 00:22:26 +0000 (+0200)
Subject: Merge remote-tracking branch 'tmk/master'
X-Git-Url: https://git.friedersdorff.com/?a=commitdiff_plain;h=a620448e7bfb1a5ec75b69c0dadb81444aa51c2e;p=max%2Ftmk_keyboard.git

Merge remote-tracking branch 'tmk/master'

Conflicts:
	README.md
---

a620448e7bfb1a5ec75b69c0dadb81444aa51c2e
diff --cc README.md
index f4d1eed2,dd03e140..78610f4b
--- a/README.md
+++ b/README.md
@@@ -53,8 -53,17 +53,16 @@@ You can find some keyboard specific pro
  * [macway](keyboard/macway/)                - [Compact keyboard mod][GH_macway] [retired]
  * [KMAC](keyboard/kmac/)                    - Korean custom keyboard
  * [Lightsaber](keyboard/lightsaber/)        - Korean custom keyboard
- * [ErgoDox](keyboard/ergodox/)              - [ergonomic keyboard with split design][GH_ergodox] (see [Ergodox-FAQ.md](keyboard/ergodox/Ergodox-FAQ.md))
+ * [Infinity](keyboard/infinity/)            - Massdrop [Infinity keyboard][Infinity]
+ * [NerD](keyboard/nerd/)                    - Korean custom keyboard
+ * [KittenPaw](keyboard/kitten_paw)          - Custom Majestouch controller
+ * [Lightpad](keyboard/lightpad)             - Korean custom keypad
+ * [ghost_squid](keyboard/ghost_squid/)      - [The Ghost Squid][ghost_squid] controller for [Cooler Master QuickFire XT][cmxt]
++* [ErgoDox](keyboard/ergodox/)              - [Ergonomic keyboard][ergodox_org] [with split design][GH_ergodox] (see [Ergodox-FAQ.md](keyboard/ergodox/Ergodox-FAQ.md))
+ 
+ ### Extenal projects using tmk_keyboard
 -* [ErgoDox_cub-uanic][cub-uanic]            - Split Ergonomic Keyboard [ErgoDox][ergodox_org]
+ * [mcdox][mcdox_tmk]                        - [mcdox][mcdox]
  
 -
  [GH_macway]:    http://geekhack.org/showwiki.php?title=Island:11930
  [GH_hhkb]:      http://geekhack.org/showwiki.php?title=Island:12047
  [GH_ps2]:       http://geekhack.org/showwiki.php?title=Island:14618