Jack Humbert
d24da945d1
Merge pull request #1319 from Johannes-Larsson/master
...
Add planck/johannes layout
2017-05-26 18:33:25 -04:00
Jack Humbert
453877422b
Merge pull request #1327 from Dbroqua/master
...
Added Integration of IBM Trackpoint
2017-05-26 18:32:43 -04:00
Jack Humbert
9851e6f3b1
Merge pull request #1328 from yiancar/qmk_usb_startup_disable
...
Use variable to disable usb check at startup
2017-05-26 18:31:23 -04:00
Jack Humbert
492115a611
Merge pull request #4 from Dbroqua/master
...
Update Modding-your-keyboard.md
2017-05-26 18:30:41 -04:00
yiancar
fa1b92fbb1
Use variable to disable usb check at startup
...
Adds a define variable which when defined disables the usb startup
check. Modified the makefile to separate above define from bluetooth
dependancy
2017-05-26 21:58:43 +01:00
Damien
6d12588cdf
Merge pull request #1 from Dbroqua/patch-1
...
Update Modding-your-keyboard.md
2017-05-26 22:16:09 +02:00
dbroqua
6b994ecd82
- Added schematic for Trackpoint demonstration
2017-05-26 21:27:11 +02:00
dbroqua
81e85a1a4e
- Added integration of IBM Trackpoint
2017-05-26 20:35:31 +02:00
Damien
6a0b13191b
Update Modding-your-keyboard.md
...
Updated `USART version` chapter.
I think there were 2 `#endif` too .
2017-05-26 16:00:48 +02:00
Damien
0a4a966c66
Merge pull request #22 from qmk/master
...
Merge from QMK
2017-05-26 15:57:08 +02:00
Jack Humbert
b003669934
Merge pull request #3 from fieldju/patch-1
...
Fix typo in Macro.md in dynamic macro section.
2017-05-24 23:43:34 -04:00
Justin Field
a9ef02105d
Fix typo in Macro.md in dynamic macro section.
2017-05-24 20:13:03 -07:00
Johannes Larsson
6d08de5c67
readme, media keys fix
2017-05-24 21:35:31 +02:00
Johannes Larsson
e4f1b238b3
revert changes to config.h
2017-05-24 21:24:13 +02:00
Jack Humbert
7a4ec3bd92
Merge pull request #1316 from nikchi/master
...
FrostyFlake Keymap
2017-05-24 13:59:30 -04:00
Johannes Larsson
690957cdbd
media keys and stuff
2017-05-24 19:00:56 +02:00
Nick Choi
006ba4bf36
moved unicodemap rules to localer make
2017-05-24 12:36:36 -04:00
Johannes Larsson
b9cf386b21
Merge branch 'master' of https://github.com/qmk/qmk_firmware
2017-05-24 17:58:11 +02:00
Erez Zukerman
ad420e7205
Merge pull request #1317 from qmk/hf/faster_mouse
...
tweaks default mouse speed constants
2017-05-24 05:09:29 -07:00
Erez Zukerman
a965e5b735
tweaks default mouse speed constants
2017-05-24 07:56:41 -04:00
Nick Choi
ef1714f443
more emoji function comments
2017-05-24 00:35:04 -04:00
Nick Choi
6536b1ce2a
Tap dancing emoji support 😩 😩
2017-05-23 23:52:48 -04:00
Erez Zukerman
e90a00c88c
then some code blocks
2017-05-23 23:09:19 -04:00
Erez Zukerman
870aaa0a7e
pipes without backtics
2017-05-23 23:06:35 -04:00
Erez Zukerman
be4ece0f3e
grrr
2017-05-23 23:05:19 -04:00
Erez Zukerman
9359abf33e
surrounds stuff with backticks
2017-05-23 23:03:30 -04:00
Erez Zukerman
260ddd3290
quick table tweak
2017-05-23 22:58:35 -04:00
Nick Choi
b3eeb9d84a
removed s
2017-05-23 18:47:06 -04:00
Nick Choi
0e174fcb48
Merge branch 'master' of https://github.com/nikchi/qmk_firmware
2017-05-23 13:13:23 -04:00
Nick Choi
3ed2147a88
preonic map
2017-05-23 13:13:20 -04:00
Nick Choi
ec86fac6ee
Merge pull request #1 from qmk/master
...
pull new to mine
2017-05-23 13:08:44 -04:00
Johannes Larsson
4f1007952b
merge
2017-05-22 15:27:57 +02:00
Johannes Larsson
53b094934f
matrix layout
2017-05-22 15:25:53 +02:00
Jack Humbert
f9a301761f
Merge pull request #2 from Vifon/master
...
Update the dynamic macro docs according to the recent changes
2017-05-21 11:27:41 -04:00
Wojciech Siewierski
8cd9d26246
Update the dynamic macro docs according to the recent changes
...
See qmk/qmk_firmware#1275 .
2017-05-21 14:27:29 +02:00
Jack Humbert
d2ad5afaa6
Merge pull request #1 from Xyverz/master
...
Adding punctuation for clarity.
2017-05-20 21:44:00 -04:00
xyverz
3588bd694e
Adding punctuation for clarity.
2017-05-20 18:39:59 -07:00
Jack Humbert
68b8f37853
favicon
2017-05-20 13:30:27 -04:00
Jack Humbert
33f886ad74
favicon
2017-05-20 13:26:08 -04:00
Jack Humbert
0cd8eb02c7
favicon
2017-05-20 13:20:10 -04:00
Jack Humbert
c7e9e643fa
Update readme.md
2017-05-20 12:38:30 -04:00
Jack Humbert
d380ed1f75
Update readme.md
2017-05-20 12:37:31 -04:00
Jack Humbert
684a02ae3f
Update SUMMARY.md
2017-05-20 12:30:24 -04:00
Jack Humbert
b3bff6404c
Update SUMMARY.md
2017-05-20 12:29:45 -04:00
Jack Humbert
046c5d332f
Update SUMMARY.md
2017-05-20 12:27:07 -04:00
Jack Humbert
5e28f88707
Update book.json
2017-05-20 12:07:31 -04:00
Jack Humbert
d678899c83
Update book.json
2017-05-20 12:04:03 -04:00
Jack Humbert
2df879cbe3
Update book.json
2017-05-20 12:02:55 -04:00
jerryen
9c284786e7
Workaround for the macOS caps lock delay ( #1308 )
...
* Add 80ms delay for KC_CAPS when used as a tap key
Workaround for the macOS caps lock delay
* Revert "Increase TAPPING_TERM for the Clueboard"
This reverts commit a74e69e9fa
.
2017-05-19 17:24:47 -07:00
Jack Humbert
85df687348
m10a lowercase
2017-05-18 18:55:07 -04:00