From: tmk <hasu@tmk-kbd.com>
Date: Mon, 19 Jan 2015 02:17:05 +0000 (+0900)
Subject: Merge branch 'ghost_squid' of https://github.com/vovcacik/tmk_keyboard into vovcacik... 
X-Git-Url: https://git.friedersdorff.com/?a=commitdiff_plain;h=a5122d5aba323514b2a466e0f0491b128b9f8823;p=max%2Ftmk_keyboard.git

Merge branch 'ghost_squid' of https://github.com/vovcacik/tmk_keyboard into vovcacik-ghost_squid

Conflicts:
	README.md
---

a5122d5aba323514b2a466e0f0491b128b9f8823
diff --cc README.md
index 31288640,550f1267..3dceb963
--- a/README.md
+++ b/README.md
@@@ -53,10 -53,7 +53,11 @@@ 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
 +* [Infinity](keyboard/infinity/)            - Massdrop [Infinity keyboard][Infinity]
 +* [NerD](keyboard/nerd/)                    - Korean custom keyboard
 +* [KittenPaw](keyboard/kittenpaw)           - 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]
  
  [GH_macway]:    http://geekhack.org/showwiki.php?title=Island:11930
  [GH_hhkb]:      http://geekhack.org/showwiki.php?title=Island:12047
@@@ -76,7 -73,8 +77,9 @@@
  [PC98]:         http://en.wikipedia.org/wiki/NEC_PC-9801
  [Sun]:          http://en.wikipedia.org/wiki/Sun-3
  [IIGS]:         http://en.wikipedia.org/wiki/Apple_IIGS
 +[Infinity]:     https://www.massdrop.com/buy/infinity-keyboard-kit
+ [ghost_squid]:  http://deskthority.net/wiki/Costar_replacement_controllers#The_Ghost_Squid
+ [cmxt]:         http://gaming.coolermaster.com/en/products/keyboards/quickfirext/