summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | updates olkb readmes #1362Jack Humbert2017-06-253-68/+30
|/
* Merge pull request #1427 from blakedietz/masterJack Humbert2017-06-259-0/+1086
|\
| * Add keymaps for ergodox ez, hhkb and jd45 under user blakedietzBlake Dietz2017-06-249-0/+1086
* | Merge pull request #1429 from fredizzimo/fixes_for_emulatorJack Humbert2017-06-2510-28/+10
|\ \ | |/ |/|
| * Change M_2_PI to 2 * PI as it should beFred Sundvik2017-06-251-1/+1
| * Update the ugfx submoduleFred Sundvik2017-06-241-0/+0
| * Change inline to static inlineFred Sundvik2017-06-242-2/+2
| * Delete emulator driversFred Sundvik2017-06-244-24/+0
| * Add function for getting the LCD backlight brightnessFred Sundvik2017-06-242-0/+5
| * Include config.h from visualizer.hFred Sundvik2017-06-241-0/+1
| * Change remote url of uGFX to relative pathFred Sundvik2017-06-241-0/+0
| * Include config.h before visualizer.hFred Sundvik2017-06-241-1/+1
* | Remove the DIODE_DIRECTION defines from lets_split so we can close #1067skullY2017-06-242-7/+1
* | Fix #1135 by changing the default to at90usb1286skullY2017-06-241-1/+1
* | Update _summary.mdJack Humbert2017-06-241-0/+1
* | Merge pull request #1425 from kynikos/patch-1Jack Humbert2017-06-241-1/+1
|\ \
| * | Fix typoDario Giovannetti2017-06-241-1/+1
* | | Merge pull request #1426 from rai-suta/masterJack Humbert2017-06-241-22/+120
|\ \ \ | |/ / |/| |
| * | Add JIS_KEYCODE layout for send_string()rai-suta2017-06-241-22/+120
|/ /
* | 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
| | | |_|_|_|_|/ | | |/| | | | |