Merge remote-tracking branch 'upstream/master' into develop

This commit is contained in:
fauxpark
2021-06-21 21:17:26 +10:00
14 changed files with 112 additions and 112 deletions

View File

@@ -1,17 +1,17 @@
# alix40
![alix40](https://i2.wp.com/tokyokeyboard.com/wp-content/uploads/2020/08/hello-alix.png)
Minimal hacker style mechanical keyboard designed in Tokyo. Cherry MX compatible. More Info at [Tokyo Keyboard](http://tokyokeyboard.com).
* Keyboard Maintainer: [quadcube](https://github.com/quadcube)
* Hardware Supported: alix40 rev1
* Hardware Availability: [Tokyo Keyboard](http://tokyokeyboard.com)
Make example for this keyboard (after setting up your build environment):
make tokyokeyboard/alix40:default
See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information.
Note:

View File

@@ -1,15 +1,15 @@
# Tokyo60
![Tokyo60](https://i2.wp.com/tokyokeyboard.com/wp-content/uploads/2018/02/AI7B4543_copy_page_20180215141449-1200x800.jpg)
Minimal hacker style mechanical keyboard designed in Tokyo. Full aluminum hi-pro construction with integrated top-plate. Cherry MX compatible. More Info at [Tokyo Keyboard](http://tokyokeyboard.com).
* Keyboard Maintainer: [Tokyo Keyboard](https://tokyokeyboard.com)
* Hardware Supported: Tokyo60 Rev.1 - 4
* Hardware Availability: [Drop](https://drop.com/buy/massdrop-x-tokyo-keyboard-tokyo60-keyboard-kit?mode=guest_open)
Make example for this keyboard (after setting up your build environment):
make tokyokeyboard/tokyo60:default
See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).