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

author: fauxpark <fauxpark@gmail.com> 2021-06-21 21:17:26 +1000
committer: fauxpark <fauxpark@gmail.com> 2021-06-21 21:17:26 +1000
commit: eaba4d327f4c8b42634872d7f3e24489d9a9f8cd (patch)
tree: 6c0d7c395623a59c6e297ce4df4f0d01d4ac02a7 /keyboards/tokyokeyboard
parent: e4a2cfd85304d7088039c8480347d5525e96e0c2 (diff)
parent: 59c572eaf085d6a71f1455a4a309bb83f5d7d83f (diff)
download: qmk_firmware-eaba4d327f4c8b42634872d7f3e24489d9a9f8cd.tar.gz
qmk_firmware-eaba4d327f4c8b42634872d7f3e24489d9a9f8cd.zip
2 files changed, 12 insertions, 12 deletions
diff --git a/keyboards/tokyokeyboard/alix40/readme.md b/keyboards/tokyokeyboard/alix40/readme.md
index b3db0c210..7f7f663d9 100644
--- a/keyboards/tokyokeyboard/alix40/readme.md
+++ b/keyboards/tokyokeyboard/alix40/readme.md
@@ -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:
diff --git a/keyboards/tokyokeyboard/tokyo60/readme.md b/keyboards/tokyokeyboard/tokyo60/readme.md
index 56c31efad..4d4f53ef0 100644
--- a/keyboards/tokyokeyboard/tokyo60/readme.md
+++ b/keyboards/tokyokeyboard/tokyo60/readme.md
@@ -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).
author	fauxpark <fauxpark@gmail.com>	2021-06-21 21:17:26 +1000
committer	fauxpark <fauxpark@gmail.com>	2021-06-21 21:17:26 +1000
commit	eaba4d327f4c8b42634872d7f3e24489d9a9f8cd (patch)
tree	6c0d7c395623a59c6e297ce4df4f0d01d4ac02a7 /keyboards/tokyokeyboard
parent	e4a2cfd85304d7088039c8480347d5525e96e0c2 (diff)
parent	59c572eaf085d6a71f1455a4a309bb83f5d7d83f (diff)
download	qmk_firmware-eaba4d327f4c8b42634872d7f3e24489d9a9f8cd.tar.gz qmk_firmware-eaba4d327f4c8b42634872d7f3e24489d9a9f8cd.zip

diff --git a/keyboards/tokyokeyboard/alix40/readme.md b/keyboards/tokyokeyboard/alix40/readme.md index b3db0c210..7f7f663d9 100644 --- a/keyboards/tokyokeyboard/alix40/readme.md +++ b/keyboards/tokyokeyboard/alix40/readme.md
@@ -1,17 +1,17 @@
1	# alix40	1	# alix40
2		2
3	![alix40](https://i2.wp.com/tokyokeyboard.com/wp-content/uploads/2020/08/hello-alix.png)	3	![alix40](https://i2.wp.com/tokyokeyboard.com/wp-content/uploads/2020/08/hello-alix.png)
4		4
5	Minimal hacker style mechanical keyboard designed in Tokyo. Cherry MX compatible. More Info at [Tokyo Keyboard](http://tokyokeyboard.com).	5	Minimal hacker style mechanical keyboard designed in Tokyo. Cherry MX compatible. More Info at [Tokyo Keyboard](http://tokyokeyboard.com).
6		6
7	* Keyboard Maintainer: [quadcube](https://github.com/quadcube)	7	* Keyboard Maintainer: [quadcube](https://github.com/quadcube)
8	* Hardware Supported: alix40 rev1	8	* Hardware Supported: alix40 rev1
9	* Hardware Availability: [Tokyo Keyboard](http://tokyokeyboard.com)	9	* Hardware Availability: [Tokyo Keyboard](http://tokyokeyboard.com)
10		10
11	Make example for this keyboard (after setting up your build environment):	11	Make example for this keyboard (after setting up your build environment):
12		12
13	make tokyokeyboard/alix40:default	13	make tokyokeyboard/alix40:default
14		14
15	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.	15	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.
16		16
17	Note:	17	Note:


diff --git a/keyboards/tokyokeyboard/tokyo60/readme.md b/keyboards/tokyokeyboard/tokyo60/readme.md index 56c31efad..4d4f53ef0 100644 --- a/keyboards/tokyokeyboard/tokyo60/readme.md +++ b/keyboards/tokyokeyboard/tokyo60/readme.md
@@ -1,15 +1,15 @@
1	# Tokyo60	1	# Tokyo60
2		2
3	![Tokyo60](https://i2.wp.com/tokyokeyboard.com/wp-content/uploads/2018/02/AI7B4543_copy_page_20180215141449-1200x800.jpg)	3	![Tokyo60](https://i2.wp.com/tokyokeyboard.com/wp-content/uploads/2018/02/AI7B4543_copy_page_20180215141449-1200x800.jpg)
4		4
5	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).	5	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).
6		6
7	* Keyboard Maintainer: [Tokyo Keyboard](https://tokyokeyboard.com)	7	* Keyboard Maintainer: [Tokyo Keyboard](https://tokyokeyboard.com)
8	* Hardware Supported: Tokyo60 Rev.1 - 4	8	* Hardware Supported: Tokyo60 Rev.1 - 4
9	* Hardware Availability: [Drop](https://drop.com/buy/massdrop-x-tokyo-keyboard-tokyo60-keyboard-kit?mode=guest_open)	9	* Hardware Availability: [Drop](https://drop.com/buy/massdrop-x-tokyo-keyboard-tokyo60-keyboard-kit?mode=guest_open)
10		10
11	Make example for this keyboard (after setting up your build environment):	11	Make example for this keyboard (after setting up your build environment):
12		12
13	make tokyokeyboard/tokyo60:default	13	make tokyokeyboard/tokyo60:default
14		14
15	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).	15	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).