aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into ps2avrGBLuiz Ribeiro2017-07-04577-27347/+17124
|\
| * Move Space Caded Parentheses to own layer (#1452)Martin Gondermann2017-07-033-23/+56
| * Keyboards/handwired magicforce61 (#1454)Kyle Terry2017-07-037-0/+369
| * Add octave lights for midi layer (#1457)Martin Gondermann2017-07-031-2/+43
| * fix tag incrementJack Humbert2017-07-031-1/+2
| * fix up travis scriptJack Humbert2017-07-022-3/+7
| * remove warningJack Humbert2017-06-301-0/+1
| * adds debouncing to sixkeyboardJack Humbert2017-06-303-21/+31
| * Update keyboards' rules.mk/Makefiles (#1442)Jack Humbert2017-06-3092-1021/+1016
| * update some copyright headersJack Humbert2017-06-2816-6/+215
| * cleanup nyquistJack Humbert2017-06-287-267/+33
| * cleanup orthodoxJack Humbert2017-06-288-345/+8
| * cleanup lets_splitJack Humbert2017-06-2820-427/+250
| * create initial code of conductJack Humbert2017-06-271-0/+15
| * Merge pull request #1445 from qmk/dual_audioJack Humbert2017-06-276-22/+303
| |\
| | * don't let timer1 exist without b5 being enabledJack Humbert2017-06-272-0/+4
| | * add new arguements, docsJack Humbert2017-06-274-2/+5
| | * Merge branch 'master' of https://github.com/qmk/qmk_firmware into dual_audioJack Humbert2017-06-2756-40/+4466
| | |\ | | |/ | |/|
| * | Add eclipse to the _summaryJack Humbert2017-06-271-0/+1
| * | Adds parenthesis where they might be neededJack Humbert2017-06-271-2/+2
| * | Merge pull request #1441 from lindhe/swedishErez Zukerman2017-06-273-0/+335
| |\ \
| | * | Create sv_SE Qwerty layout for ErgoDoxAndreas Lindhé2017-06-273-0/+335
| |/ /
| * | Allow mod swapping for mod tap (MT) (#1202)Jack Humbert2017-06-263-1/+32
| * | Merge pull request #1431 from rai-suta/masterJack Humbert2017-06-255-1/+147
| |\ \
| | * | Add a keymap for testing JIS_KEYCODE.rai-suta2017-06-264-0/+146
| | * | Fix bug.rai-suta2017-06-261-1/+1
| * | | Whitefox LED control (#1432)Ethan Madden2017-06-2517-36/+1080
| * | | add support for Orthodox keyboard (#1436)Art Ortenburger2017-06-2526-0/+2869
| | | * no glideJack Humbert2017-06-271-1/+1
| | | * working duopholyJack Humbert2017-06-271-4/+58
| | | * b5 audioJack Humbert2017-06-271-20/+240
| | |/ | |/|
| * | 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
| |/ /