aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of github.com:qmk/qmk_firmware into hf/shinydoxJack Humbert2018-06-12771-5089/+35710
|\
| * Added a multiple layout keymap for DZ60 (#3159)Breno Reis2018-06-107-0/+572
| * Fortitude60: Refactor and Configurator support (#3161)noroadsleft2018-06-102-22/+32
| * Felix: Refactor, Rules, and Configurator Support (#3160)noroadsleft2018-06-104-11/+27
| * Add Tetris keyboard to QMK (#3158)YouCanFly2018-06-096-0/+1005
| * Add TKC keymap (#3157)Yan-Fa Li2018-06-092-0/+174
| * Fixsingakeymaps (#3156)Jason2018-06-091-4/+4
| * Adding Singa Repo w/ Config Support (#3155)Jason2018-06-0922-0/+1184
| * Additional default layouts: Fullsize ANSI, Fullsize ISO, TKL ISO (#3154)noroadsleft2018-06-099-0/+63
| * Fix KC_P00 macro for ortho_5x4 layout (#3152)noroadsleft2018-06-091-1/+1
| * Add corne keyboard (#3119)Kosuke Adachi2018-06-0829-0/+2710
| * citadel: new keymap for pegasushoof (#3146)Daniel Rose2018-06-084-0/+239
| * Ergo42: Refactor and Configurator support (#3150)noroadsleft2018-06-088-409/+399
| * DZ60: Add LAYOUT_directional_625_space (#3148)noroadsleft2018-06-082-28/+44
| * Keyboard that works on Qwerty or Bepo OS keyboards. (#3149)Eric Gebhart2018-06-089-0/+1675
| * Add DCompact Layout for Chimera Ortho and Planck Keyboards (#3145)Dan2018-06-078-0/+465
| * Eco: Refactor, Configurator support and Readme changes (#3143)noroadsleft2018-06-079-297/+302
| * DK60: Refactor, Configurator and Readme updates (#3142)noroadsleft2018-06-074-32/+44
| * Normacos update (#3141)Jorge Porras2018-06-072-23/+48
| * Gherkin: Refactor and Configurator support [resolved] (#3140)noroadsleft2018-06-0712-363/+287
| * Add premade layouts for Numpad 4x4, Numpad 5x4, Ortho 5x4, and Planck MIT (#3...noroadsleft2018-06-0712-0/+113
| * Bootloader make issue (#2975)yiancar2018-06-061-9/+9
| * Dilly: Refactor and Configurator support (#3134)noroadsleft2018-06-069-86/+76
| * Added jwlawrence keymap for zen keyboard (#3137)Joshua Lawrence2018-06-063-0/+150
| * Sweeping Visualizer for Ergodox Inifinity (#3136)Oryhara2018-06-063-218/+389
| * Diverge3: Readme Clean-up, Refactor and Configurator support (#3135)noroadsleft2018-06-064-45/+45
| * Dichotemy: Refactor and Configurator update (#3133)noroadsleft2018-06-063-43/+55
| * Refactor for DeltaSplit75 (#3132)noroadsleft2018-06-065-83/+91
| * remove trailing comma to fix parsing issue (#3130)Jason2018-06-061-5/+5
| * Add ErgoDash keyboard (#3128)omkbd2018-06-0619-0/+1578
| * Adding SX60 work by amnobis and configurator settings (#3122)Jason2018-06-0521-14/+1131
| * Gherkin wanleg (#3127)wanleg2018-06-052-6/+6
| * adding all ErgoTravel Files (#3129)Pierre Constantineau2018-06-0533-83/+2635
| * [WIP] [Help Needed] Daisy 40%: Refactor and Configurator update (#3124)noroadsleft2018-06-043-86/+102
| * CU75: Refactor and Configurator updates (#3123)noroadsleft2018-06-045-72/+82
| * Keymap with dynamic macro (#3121)crilith2018-06-041-0/+83
| * Support ios to default keymap (#3118)MakotoKurauchi2018-06-0411-31/+1313
| * Added ASCII legend to melody96 to help visualize the layouts (#3117)fordmustang5l2018-06-041-0/+50
| * change to ca66 kelorean layout (#3116)KeLorean2018-06-041-1/+2
| * Add rgblight mode 35 (R,G,B test mode) (#3114)Takeshi ISHII2018-06-046-5/+48
| * Add Suspend functions (#3112)Drashna Jaelre2018-06-034-2/+104
| * Refactor Chocopad to support LAYOUT_ortho_4x4 macro (#3106)noroadsleft2018-06-024-6/+8
| * Add ability to write additional code in matrix scann loop on slave. (#3072)Andrew Dunai2018-06-021-0/+5
| * Melody96 QMK Support (#3108)kaylanm2018-06-026-0/+229
| * planck/premek layout - thumb shift, mouse middleclick (#3111)Přemek Vyhnal2018-06-024-8/+9
| * Fix helix:led_test build break (#3110)Takeshi ISHII2018-06-023-47/+168
| * Fixed mistake to kelorean keymap for ca66 (#3109)KeLorean2018-06-021-25/+25
| * Dhertz' keymaps (#3094)Dan Hertz2018-06-0216-16/+396
| * Add support for staggerd column layout KB "Fortitude60" (#3090)Pekaso2018-06-0217-0/+1317
| * Remove bootloader key as it is no longer used (#3093)Dan Hertz2018-06-011-10/+0