aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix typoDario Giovannetti2017-06-241-1/+1
* update docs for ispJack Humbert2017-06-232-2/+2
* Merge branch 'master' of https://github.com/qmk/qmk_firmwareJack Humbert2017-06-2334-322/+2615
|\
| * Merge pull request #1422 from nstickney/masterJack Humbert2017-06-233-63/+82
| |\
| | * updated README.mdStick2017-06-232-5/+3
| | * Merge remote-tracking branch 'upstream/master'Stick2017-06-2318-259/+738
| | |\
| | * | added media keys; many bug fixesStick2017-06-232-27/+26
| | * | added tapdance lockingStick2017-06-222-44/+66
| | * | Merge remote-tracking branch 'upstream/master'Stick2017-06-22485-25863/+9757
| | |\ \
| | * | | Revert "ugly workaround for ErgoDoxEZ LED bugs: turn 'em all off"Stick2017-06-083-23/+24
| | * | | trying to fix LEDsStick2017-06-081-21/+21
| | * | | Merge remote-tracking branch 'upstream/master'Stick2017-06-0812-3/+361
| | |\ \ \
| | * \ \ \ Merge remote-tracking branch 'upstream/master'Stick2017-06-0711-28/+279
| | |\ \ \ \
| | * | | | | ugly workaround for ErgoDoxEZ LED bugs: turn 'em all offStick2017-06-023-45/+44
| | * | | | | moved alt out from under spaceStick2017-06-021-7/+7
| | * | | | | Merge remote-tracking branch 'upstream/master'Stick2017-06-02376-684/+16127
| | |\ \ \ \ \
| | * | | | | | small changesStick2017-04-182-6/+6
| * | | | | | | Update _summary.mdJack Humbert2017-06-231-0/+1
| * | | | | | | Create isp_flashing_guide.mdJack Humbert2017-06-231-0/+106
| * | | | | | | Merge pull request #1418 from npoirey/masterJack Humbert2017-06-2311-0/+1688
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| | * | | | | | Updated frenchdev readmenpoirey2017-06-231-10/+48
| | * | | | | | Refactoring frenchdevnpoirey2017-06-235-59/+61
| | * | | | | | Moved frenchdev to handwirednpoirey2017-06-2316-167/+77
| | * | | | | | Removed image from git and added references to imgur album for Frenchdev keyb...npoirey2017-06-222-0/+9
| | * | | | | | Fix warning in frenchdevnpoirey2017-06-221-2/+2
| | * | | | | | Frenchdev v1npoirey2017-06-2216-0/+1729
| * | | | | | | Merge pull request #1421 from 333fred/update-layoutJack Humbert2017-06-234-61/+106
| |\ \ \ \ \ \ \
| | * | | | | | | Doc updatesFredric Silberberg2017-06-232-18/+22
| | * | | | | | | Copy/paste additions.Fredric Silberberg2017-06-232-15/+17
| | * | | | | | | Added backlight control keysFredric Silberberg2017-06-232-5/+4
| | * | | | | | | Added a few more VS macros and another ctrlFredric Silberberg2017-06-231-11/+30
| | * | | | | | | Small keymap layout updatesFredric Silberberg2017-06-233-18/+39
| | | |_|_|_|_|/ | | |/| | | | |
| * | | | | | | Merge pull request #1419 from Wraul/phantom-improvementsJack Humbert2017-06-2314-198/+632
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Update Phantom readmeMathias Andersson2017-06-232-3/+46
| | * | | | | | Adjust Phantom for standard PCBMathias Andersson2017-06-2310-121/+405
| | * | | | | | Update Phantom config to better match templateMathias Andersson2017-06-232-22/+122
| | * | | | | | Move Phantom LED handling to phantom.cMathias Andersson2017-06-233-53/+60
| |/ / / / / /
* / / / / / / add other mcu bootloadersJack Humbert2017-06-233-0/+540
|/ / / / / /
* | | | | | Update _summary.mdJack Humbert2017-06-221-1/+2
* | | | | | Create adding_a_keyboard_to_qmk.mdJack Humbert2017-06-221-0/+35
* | | | | | Update porting_your_keyboard_to_qmk.mdJack Humbert2017-06-221-1/+5
* | | | | | Merge pull request #1416 from geofflane/feature/s65_x_std_grv_escJack Humbert2017-06-223-200/+6
|\ \ \ \ \ \
| * | | | | | Use the new Quantum KC_GESC instead of custom codeGeoff Lane2017-06-213-200/+6
* | | | | | | Merge pull request #1331 from ariasuni/masterErez Zukerman2017-06-224-8/+62
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Fix undefined reference errors with avr-gcc 7.1ariasuni2017-05-274-8/+62
* | | | | | | add group edge via travis updatesJack Humbert2017-06-211-0/+1
| |/ / / / / |/| | | | |
* | | | | | Merge pull request #1405 from cquiroz/oneshot-mods-timeoutJack Humbert2017-06-201-1/+3
|\ \ \ \ \ \
| * | | | | | Remove noisy debug lineCarlos Quiroz2017-06-181-1/+0
| * | | | | | Deactivate oneshot mods once timedoutCarlos Quiroz2017-06-181-0/+3
* | | | | | | Merge pull request #1414 from dvdizon/kbd75Jack Humbert2017-06-207-0/+361
|\ \ \ \ \ \ \