aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into masterJack Humbert2017-04-03230-2363/+10012
|\
| * Merge pull request #1204 from nooges/lets-split-fixesJack Humbert2017-04-0313-120/+120
| |\
| | * Include use of either TRS or TRRSDanny Nguyen2017-04-031-3/+2
| | * Remove flip-half from keymapDanny Nguyen2017-04-031-1/+0
| | * Update Let’s Split readmeDanny Nguyen2017-04-031-3/+9
| | * Move SSD1306 function declarations to header fileDanny Nguyen2017-04-035-14/+21
| | * Move defines for RGB to after the config.h includeDanny Nguyen2017-04-031-10/+7
| | * Rename COMPACT_KEYMAP to KC_KEYMAP and move to lets_split.hDanny Nguyen2017-04-033-41/+21
| | * Revise KEYMAP macro to make left and right halves more clearDanny Nguyen2017-04-032-52/+52
| | * Move defines for RGB to after the config.h includeDanny Nguyen2017-04-031-7/+7
| | * Revert removal of avrdude make optionDanny Nguyen2017-04-032-2/+14
| * | disables space cadet rolloverErez Zukerman2017-04-031-0/+3
| * | quick fix for space cadet shiftJack Humbert2017-04-031-5/+5
| |/
| * Merge pull request #1194 from tong92/masterJack Humbert2017-04-024-0/+223
| |\
| | * Adds tong92's keymap to tv44=2017-04-024-0/+223
| * | Merge pull request #1195 from fudanchii/kbodJack Humbert2017-04-0210-0/+446
| |\ \
| | * | Use tap-toggle to move between layers.Nurahmadie2017-04-021-4/+4
| | * | Fix layer stuck, and add numpad supportNurahmadie2017-04-022-10/+15
| | * | Forgot semicolon, and add reference linkNurahmadie2017-04-022-2/+4
| | * | Add READMENurahmadie2017-04-022-18/+13
| | * | Enable alt-F4 without [Fn]Nurahmadie2017-04-021-21/+41
| | * | Add capslock led, and audio buttonsNurahmadie2017-04-021-16/+26
| | * | Remove lead keys, fix some typos, rearrange layersNurahmadie2017-04-022-29/+10
| | * | Add initial keymapNurahmadie2017-04-022-28/+73
| | * | Initial work for my kbod support in qmk_firmwareNurahmadie2017-04-0210-0/+388
| | |/
| * | Merge pull request #1196 from Dbroqua/masterJack Humbert2017-04-022-0/+199
| |\ \
| | * | Merge pull request #19 from qmk/masterDamien2017-04-02269-2376/+14063
| | |\|
| | * | Merge remote-tracking branch 'origin/master'dbroqua2017-04-02252-2662/+9842
| | |\ \
| | | * \ Merge pull request #18 from qmk/masterDamien2017-03-05252-2662/+9842
| | | |\ \
| | * | | | - Added MX HHKB like for gh60 with 7u space bardbroqua2017-04-022-0/+199
| | |/ / /
| | * | | Merge pull request #17 from qmk/masterDamien2017-01-2661-574/+2705
| | |\ \ \
| | * \ \ \ Merge pull request #16 from jackhumbert/masterDamien2017-01-1587-347/+3772
| | |\ \ \ \
| | * \ \ \ \ Merge pull request #15 from jackhumbert/masterDamien2017-01-0769-2383/+21443
| | |\ \ \ \ \
| * | \ \ \ \ \ Merge pull request #1197 from Xyverz/masterJack Humbert2017-04-0220-201/+1334
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master'Xyverz2017-04-02292-2625/+14818
| | |\ \ \ \ \ \ \ | | | | |_|_|_|_|/ | | | |/| | | | |
| | * | | | | | | removed my handwired boards to a new branch.Xyverz2017-04-0217-698/+0
| | * | | | | | | Tidied up keymaps, Makefiles that actually work, Clueboard make v1.0Xyverz2017-03-296-56/+89
| | * | | | | | | Removed preceeding underscore from MASTER_RIGHT in config.hXyverz2017-03-051-1/+1
| | * | | | | | | Merge remote-tracking branch 'upstream/master'Xyverz2017-03-0341-135/+1906
| | |\ \ \ \ \ \ \
| | * | | | | | | | Final tweaks to my Kinesis keymap and readmeXyverz2017-03-032-22/+13
| | * | | | | | | | Updates to the README.mdXyverz2017-02-261-5/+5
| | * | | | | | | | Minor changes to the keymap: Moved thumb-cluster ESC to Media and Keypad layersXyverz2017-02-261-15/+15
| | * | | | | | | | Merge remote-tracking branch 'upstream/master'Xyverz2017-02-2068-1672/+1971
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | Fixed the TODO list.Xyverz2017-02-161-3/+1
| | * | | | | | | | | Fixed inaccuracies in keymap comments and the readme.Xyverz2017-02-152-7/+7
| | * | | | | | | | | More refinements to my Kinesis keymap. Added a readme.md file.Xyverz2017-02-152-56/+270
| | * | | | | | | | | minor adjustments.Xyverz2017-02-151-6/+6
| | * | | | | | | | | Added my keymap to the Kinesis project.Xyverz2017-02-154-0/+256
| | * | | | | | | | | Merge remote-tracking branch 'upstream/master'Xyverz2017-02-1133-439/+1334
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Changes to the keymap to accommodate the RGB Underglow lighting.Xyverz2017-02-111-5/+5