summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2017-05-07Merge branch 'dev'Adam Lee9-12/+408
2017-05-07[Miuni32] Rm accidentally committed fileAdam Lee1-42/+0
2017-05-07Merge remote-tracking branch 'bigtunaio/layouts/adam-lee' into devAdam Lee5-0/+191
2017-05-07Merge remote-tracking branch 'upstream/master'Adam Lee164-521/+3829
2017-05-07Merge remote-tracking branch 'upstream/master' into devAdam Lee123-459/+3724
2017-05-04Merge pull request #1272 from Thor77/ps2avrGB-keymap-kc-prefixJack Humbert2-8/+26
2017-05-04Merge pull request #1273 from Vifon/pr_1267_fixJack Humbert6-12/+270
2017-05-04revise HHKB bootloader_size to 4096 such that sw reset works (#1274)tengg1-1/+1
2017-05-04dynamic_macro.h: Fix an off-by-two errorWojciech Siewierski1-3/+3
2017-05-04dynamic_macro.h: Always toggle the backlight twice as a notificationWojciech Siewierski1-3/+1
2017-05-04dynamic_macro.h: Ignore all the initial key releasesWojciech Siewierski1-2/+9
2017-05-03Use KC_KEYMAP for default-keymapThor771-8/+8
2017-05-03Add KEYMAP without KC_##-prefixThor771-0/+18
2017-05-01Merge pull request #1269 from ryanmaclean/patch-6Jack Humbert1-6/+3
2017-05-01Cleaning Up Dockerfile Layers Per Official DocsRyan MacLean1-6/+3
2017-04-30Merge pull request #1266 from ryanmaclean/patch-5Jack Humbert2-0/+76
2017-04-30Merge pull request #1268 from priyadi/promethiumJack Humbert9-85/+215
2017-04-30Merge pull request #1264 from fredizzimo/wsl_supportJack Humbert2-20/+26
2017-04-30fixes s60_x keyboardJack Humbert53-31/+44
2017-04-30Merge pull request #1263 from Dbroqua/masterJack Humbert5-62/+26
2017-04-30Simple RGB backlight themingPriyadi Iman Nurcahyo5-72/+161
2017-04-30Syntax fixPriyadi Iman Nurcahyo1-2/+2
2017-04-30Update vifon keymap to use `DYN_REC_STOP`Weiyi Lou1-1/+2
2017-04-30Add cinaeco hhkb keymapWeiyi Lou4-0/+252
2017-04-30Add `DYN_REC_STOP` to dynamic macrosWeiyi Lou1-3/+3
2017-04-30Addind Sample Maxed Out KeymapRyan MacLean1-0/+61
2017-04-30Adding Maximized LayoutRyan MacLean1-0/+15
2017-04-29Add possibility to override the command to execute when flashingFred Sundvik2-20/+26
2017-04-29Merge branch 'master' of https://github.com/Dbroqua/qmk_firmwaredbroqua92-234/+2831
2017-04-29Merge pull request #21 from qmk/masterDamien92-234/+2831
2017-04-29- Fixed bugs in rules.mk for S60-Xdbroqua5-62/+26
2017-04-29Promethium update: demo LED, fix PS2 delay, fix LED ordering, change click fr...Priyadi Iman Nurcahyo4-22/+55
2017-04-28Modified ht_156 keymaphtang1561-9/+13
2017-04-27Merge pull request #1259 from laelath/masterJack Humbert2-11/+121
2017-04-26Expanded lae3 keymap readmelaelath2-11/+121
2017-04-26Merge pull request #1258 from smt/smt/hhkbJack Humbert1-0/+176
2017-04-25Merge pull request #1231 from Dbroqua/masterJack Humbert15-209/+458
2017-04-25Merge pull request #1253 from laelath/masterJack Humbert4-0/+294
2017-04-25Merge pull request #1255 from ryanmaclean/patch-4Jack Humbert2-0/+130
2017-04-25Merge pull request #1257 from MachineIndustries/keyboards/M10AJack Humbert7-0/+229
2017-04-25Add RAMA x Machine Industries M10A to the keyboards directoryJosh Black7-0/+229
2017-04-24Add smt keymap for HHKBStephen Tudor1-0/+176
2017-04-24Switched Alt and GUI key placesJustin Frank1-2/+2
2017-04-23Adding Right LayoutRyan MacLean1-0/+65
2017-04-23Update keymap.cRyan MacLean0-0/+0
2017-04-23Initial Ortho Commit (LEFT SIDE)Ryan MacLean1-0/+65
2017-04-23Added lae3 keymapJustin Frank4-0/+294
2017-04-22Added an additional clueboard layout. (#1252)Solomon6-0/+130
2017-04-22Tweak the shift_fn keymap so it worksskullY2-19/+22
2017-04-19- Moved S60-X RGB in sub project for S60-Xdbroqua19-345/+170