summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | Merge remote-tracking branch 'upstream/master'Adam Lee2017-05-07164-521/+3829
| |\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| / / / / / / / / / | |/ / / / / / / / /
* | | | | | | | | | Merge pull request #1272 from Thor77/ps2avrGB-keymap-kc-prefixJack Humbert2017-05-042-8/+26
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Use KC_KEYMAP for default-keymapThor772017-05-031-8/+8
| * | | | | | | | | | Add KEYMAP without KC_##-prefixThor772017-05-031-0/+18
| | |_|_|_|/ / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #1273 from Vifon/pr_1267_fixJack Humbert2017-05-046-12/+270
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | |
| * | | | | | | | | dynamic_macro.h: Fix an off-by-two errorWojciech Siewierski2017-05-041-3/+3
| * | | | | | | | | dynamic_macro.h: Always toggle the backlight twice as a notificationWojciech Siewierski2017-05-041-3/+1
| * | | | | | | | | dynamic_macro.h: Ignore all the initial key releasesWojciech Siewierski2017-05-041-2/+9
| * | | | | | | | | Update vifon keymap to use `DYN_REC_STOP`Weiyi Lou2017-04-301-1/+2
| * | | | | | | | | Add cinaeco hhkb keymapWeiyi Lou2017-04-304-0/+252
| * | | | | | | | | Add `DYN_REC_STOP` to dynamic macrosWeiyi Lou2017-04-301-3/+3
* | | | | | | | | | revise HHKB bootloader_size to 4096 such that sw reset works (#1274)tengg2017-05-041-1/+1
| |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | Merge pull request #1269 from ryanmaclean/patch-6Jack Humbert2017-05-011-6/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Cleaning Up Dockerfile Layers Per Official DocsRyan MacLean2017-04-301-6/+3
|/ / / / / / / / /
* | | | | | | | | Merge pull request #1266 from ryanmaclean/patch-5Jack Humbert2017-04-302-0/+76
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Addind Sample Maxed Out KeymapRyan MacLean2017-04-291-0/+61
| * | | | | | | | | Adding Maximized LayoutRyan MacLean2017-04-291-0/+15
| |/ / / / / / / /
* | | | | | | | | Merge pull request #1268 from priyadi/promethiumJack Humbert2017-04-309-85/+215
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Simple RGB backlight themingPriyadi Iman Nurcahyo2017-04-305-72/+161
| * | | | | | | | | Syntax fixPriyadi Iman Nurcahyo2017-04-301-2/+2
| * | | | | | | | | Promethium update: demo LED, fix PS2 delay, fix LED ordering, change click fr...Priyadi Iman Nurcahyo2017-04-294-22/+55
| * | | | | | | | | tune clicksPriyadi Iman Nurcahyo2017-04-191-3/+3
| * | | | | | | | | Merge remote-tracking branch 'upstream/master' into promethiumPriyadi Iman Nurcahyo2017-04-198-71/+300
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix LED sequence; bug fixesPriyadi Iman Nurcahyo2017-04-192-10/+18
* | | | | | | | | | | Merge pull request #1264 from fredizzimo/wsl_supportJack Humbert2017-04-302-20/+26
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Add possibility to override the command to execute when flashingFred Sundvik2017-04-292-20/+26
| | |_|/ / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | fixes s60_x keyboardJack Humbert2017-04-3053-31/+44
* | | | | | | | | | | Merge pull request #1263 from Dbroqua/masterJack Humbert2017-04-305-62/+26
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Merge branch 'master' of https://github.com/Dbroqua/qmk_firmwaredbroqua2017-04-2992-234/+2831
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge pull request #21 from qmk/masterDamien2017-04-2992-234/+2831
| | |\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #1259 from laelath/masterJack Humbert2017-04-262-11/+121
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Expanded lae3 keymap readmelaelath2017-04-262-11/+121
| | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge pull request #1258 from smt/smt/hhkbJack Humbert2017-04-261-0/+176
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Add smt keymap for HHKBStephen Tudor2017-04-241-0/+176
* | | | | | | | | | | | Merge pull request #1231 from Dbroqua/masterJack Humbert2017-04-2515-209/+458
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge pull request #1253 from laelath/masterJack Humbert2017-04-254-0/+294
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Switched Alt and GUI key placesJustin Frank2017-04-231-2/+2
| * | | | | | | | | | | | Added lae3 keymapJustin Frank2017-04-224-0/+294
* | | | | | | | | | | | | Merge pull request #1255 from ryanmaclean/patch-4Jack Humbert2017-04-252-0/+130
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Adding Right LayoutRyan MacLean2017-04-221-0/+65
| * | | | | | | | | | | | | Update keymap.cRyan MacLean2017-04-220-0/+0
| * | | | | | | | | | | | | Initial Ortho Commit (LEFT SIDE)Ryan MacLean2017-04-221-0/+65
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge pull request #1257 from MachineIndustries/keyboards/M10AJack Humbert2017-04-257-0/+229
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Add RAMA x Machine Industries M10A to the keyboards directoryJosh Black2017-04-257-0/+229
|/ / / / / / / / / / / /
* | | | | | | | | | | | Added an additional clueboard layout. (#1252)Solomon2017-04-226-0/+130
* | | | | | | | | | | | Tweak the shift_fn keymap so it worksskullY2017-04-212-19/+22
* | | | | | | | | | | | Merge pull request #1246 from reversebias/masterJack Humbert2017-04-198-0/+687
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Update readme.mdreversebias2017-04-191-158/+6
| * | | | | | | | | | | | First Commitcam2017-04-198-0/+839
| * | | | | | | | | | | | Delete tempreversebias2017-04-191-1/+0