summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2017-06-25Merge pull request #1427 from blakedietz/masterJack Humbert9-0/+1086
2017-06-25Merge pull request #1429 from fredizzimo/fixes_for_emulatorJack Humbert10-28/+10
2017-06-25Change M_2_PI to 2 * PI as it should beFred Sundvik1-1/+1
2017-06-25Add keymaps for ergodox ez, hhkb and jd45 under user blakedietzBlake Dietz9-0/+1086
2017-06-25Remove the DIODE_DIRECTION defines from lets_split so we can close #1067skullY2-7/+1
2017-06-25Fix #1135 by changing the default to at90usb1286skullY1-1/+1
2017-06-24Update _summary.mdJack Humbert1-0/+1
2017-06-24Merge pull request #1425 from kynikos/patch-1Jack Humbert1-1/+1
2017-06-24Merge pull request #1426 from rai-suta/masterJack Humbert1-22/+120
2017-06-24Add JIS_KEYCODE layout for send_string()rai-suta1-22/+120
2017-06-24Fix typoDario Giovannetti1-1/+1
2017-06-24update docs for ispJack Humbert2-2/+2
2017-06-24Merge branch 'master' of https://github.com/qmk/qmk_firmwareJack Humbert34-322/+2615
2017-06-24add other mcu bootloadersJack Humbert3-0/+540
2017-06-24Merge pull request #1422 from nstickney/masterJack Humbert3-63/+82
2017-06-24Update _summary.mdJack Humbert1-0/+1
2017-06-24Create isp_flashing_guide.mdJack Humbert1-0/+106
2017-06-24Merge pull request #1418 from npoirey/masterJack Humbert11-0/+1688
2017-06-23Updated frenchdev readmenpoirey1-10/+48
2017-06-23Update the ugfx submoduleFred Sundvik1-0/+0
2017-06-23Change inline to static inlineFred Sundvik2-2/+2
2017-06-23Delete emulator driversFred Sundvik4-24/+0
2017-06-23Add function for getting the LCD backlight brightnessFred Sundvik2-0/+5
2017-06-23Include config.h from visualizer.hFred Sundvik1-0/+1
2017-06-23Change remote url of uGFX to relative pathFred Sundvik1-0/+0
2017-06-23Include config.h before visualizer.hFred Sundvik1-1/+1
2017-06-23updated README.mdStick2-5/+3
2017-06-23Merge remote-tracking branch 'upstream/master'Stick18-259/+738
2017-06-23added media keys; many bug fixesStick2-27/+26
2017-06-23Refactoring frenchdevnpoirey5-59/+61
2017-06-23Moved frenchdev to handwirednpoirey16-167/+77
2017-06-23Merge pull request #1421 from 333fred/update-layoutJack Humbert4-61/+106
2017-06-23Merge pull request #1419 from Wraul/phantom-improvementsJack Humbert14-198/+632
2017-06-23Doc updatesFredric Silberberg2-18/+22
2017-06-23Copy/paste additions.Fredric Silberberg2-15/+17
2017-06-23Added backlight control keysFredric Silberberg2-5/+4
2017-06-23Added a few more VS macros and another ctrlFredric Silberberg1-11/+30
2017-06-23Small keymap layout updatesFredric Silberberg3-18/+39
2017-06-23Update Phantom readmeMathias Andersson2-3/+46
2017-06-23Adjust Phantom for standard PCBMathias Andersson10-121/+405
2017-06-23Update Phantom config to better match templateMathias Andersson2-22/+122
2017-06-23Move Phantom LED handling to phantom.cMathias Andersson3-53/+60
2017-06-23added tapdance lockingStick2-44/+66
2017-06-22Removed image from git and added references to imgur album for Frenchdev keyb...npoirey2-0/+9
2017-06-22Merge remote-tracking branch 'upstream/master'Stick485-25863/+9757
2017-06-22Update _summary.mdJack Humbert1-1/+2
2017-06-22Create adding_a_keyboard_to_qmk.mdJack Humbert1-0/+35
2017-06-22Update porting_your_keyboard_to_qmk.mdJack Humbert1-1/+5
2017-06-22Merge pull request #1416 from geofflane/feature/s65_x_std_grv_escJack Humbert3-200/+6
2017-06-22Merge pull request #1331 from ariasuni/masterErez Zukerman4-8/+62