5942 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
jpetermans	ac97870801	reduce recurring writes to lock leds	2017-05-25 13:00:21 -07:00
Nick Choi	e695b5a33b	Added per case tapping term, updated FF-nikchi keymap.	2017-05-25 00:41:00 -04: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
Nick Choi	17a378715e	Tapping Term and Memes TD for FF	2017-05-24 23:43:02 -04:00
Justin Field	a9ef02105d	Fix typo in Macro.md in dynamic macro section.	2017-05-24 20:13:03 -07:00
Ante Laurijssen	1a0dfbbc96	More updates to keymap.c - still errors with midi when trying to compile	2017-05-24 21:15:41 -04:00
Johannes Larsson	6d08de5c67	readme, media keys fix	2017-05-24 21:35:31 +02:00
jpetermans	083267680d	Restore deleted MEMO.txt from master	2017-05-24 12:26:56 -07:00
Johannes Larsson	e4f1b238b3	revert changes to config.h	2017-05-24 21:24:13 +02:00
jpetermans	e6c9b07e1c	Merge branch 'user_led_configuration' into infinity60 ... Conflicts: keyboards/infinity60/keymaps/jpetermans/keymap.c	2017-05-24 12:07:18 -07:00
jpetermans	2dcd6c38fa	Merge remote-tracking branch 'upstream/master' into infinity60	2017-05-24 11:51:20 -07:00
jpetermans	f54b4771eb	keymap example update and tweak to set_led_bit function	2017-05-24 11:20:50 -07: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
Ante Laurijssen	4d783d0e69	More work on my keymap.c and added .png images of my different layers.	2017-05-22 23:30:25 -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
Ante Laurijssen	06433eb1a0	More work on keymap.c and config.h	2017-05-21 22:37:20 -04: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
Ante Laurijssen	34a1bf9e20	Merge https://github.com/qmk/qmk_firmware ... Update my qmk_firmware fork	2017-05-21 08:44:52 -04:00
Ante Laurijssen	b766407cbe	Continuing work on keymap.c	2017-05-21 08:40:42 -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