summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #297 from gid0/masterErez Zukerman2016-06-013-0/+1546
|\
| * Update firmware with latest QMK code.Olivier2016-04-301-975/+975
| * Merge https://github.com/jackhumbert/qmk_firmwareOlivier2016-04-30127-11022/+22421
| |\
| * | Add a macro for Ctrl+Alt+Fx.Olivier2016-04-302-1189/+1202
| * | Use aliases where available. No firmware change.Olivier2016-04-171-6/+6
| * | Commit firmware up-to-date with latest upstream qmk_firmware changes.Olivier2016-04-171-972/+996
| * | Merge https://github.com/jackhumbert/qmk_firmwareOlivier2016-04-1753-1845/+4157
| |\ \
| * | | Add underscore "_" character in the qwerty compatibility layer.Olivier2016-04-172-3/+3
| * | | Even more compatibility with QWERTY systems : added most useful characters ne...Olivier2016-04-162-1131/+1180
| * | | More compatibility with QWERTY systems.Olivier2016-04-162-1133/+1181
| * | | Simple layer to allow the keyboard to act like a bepo keyboard when plugged o...Olivier2016-04-162-1128/+1177
| * | | Add mouse navigation keys on a new layer.Olivier2016-04-162-1086/+1134
| * | | More concise, no functional change.Olivier2016-04-161-1/+1
| * | | Allow the "00" keypad key to act like a repeating 0 when held down.Olivier2016-04-162-1103/+1106
| * | | Correct a bug with stuck modifier keys when they were used with other layers ...Olivier2016-04-162-20/+20
| * | | Second try with a (maybe) more practical layout :Olivier2016-04-163-46/+46
| * | | Merge branch 'master' of https://github.com/gid0/qmk_firmwareOlivier2016-04-160-0/+0
| |\ \ \
| | * | | Layout preview generated on keyboard-layout-editor.com.Olivier2016-04-161-0/+0
| | * | | First version of a bepo (french layout based on Dvorak rules) keymap.Olivier2016-04-112-0/+1312
| | * | | Merge pull request #246 from romanzolotarev/masterErez Zukerman2016-04-115-5/+1331
| | |\ \ \
| | | * | | Add HJKL layoutRoman Zolotarev2016-04-115-5/+1331
| * | | | | Layout preview generated on keyboard-layout-editor.com.Olivier2016-04-161-0/+0
| * | | | | First version of a bepo (french layout based on Dvorak rules) keymap.zozo2016-04-112-0/+1312
* | | | | | Merge pull request #367 from waveform80/fix-unselect-rows-prototypeErez Zukerman2016-05-311-1/+1
|\ \ \ \ \ \
| * | | | | | Squash the prototype compiler warningDave Jones2016-05-311-1/+1
* | | | | | | Merge pull request #368 from waveform80/daves-layout-readmeErez Zukerman2016-05-313-1136/+1222
|\ \ \ \ \ \ \
| * | | | | | | Added a README and minor tweaksDave Jones2016-05-313-1136/+1222
| |/ / / / / /
* | | | | | | Merge pull request #356 from johgh/masterErez Zukerman2016-05-313-0/+5754
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' of https://github.com/johgh/qmk_firmwarejorge2016-05-300-0/+0
| |\ \ \ \ \ \ \
| | * | | | | | | ergodox_ez: added dvorak_spanish layoutjorge2016-05-282-0/+383
| * | | | | | | | ergodox_ez: added dvorak_spanish layoutjorge2016-05-303-0/+5754
| |/ / / / / / /
* | / / / / / / Update to Makefile an ergodox readme (#365)Hartmut Goebel2016-05-312-4/+9
| |/ / / / / / |/| | | | | |
* | | | | | | Merge pull request #353 from algernon/ergodox-ez/algernonErez Zukerman2016-05-2910-0/+3029
|\ \ \ \ \ \ \
| * | | | | | | ergodox_ez/algernon: Add a HEX fileGergely Nagy2016-05-261-0/+1259
| * | | | | | | ergodox_ez/algernon: New layout.Gergely Nagy2016-05-269-0/+1770
* | | | | | | | Add support for the KC60 v2.0 2015-09-12 (#360)Samuel Goodwin2016-05-297-0/+515
* | | | | | | | Fix build errors (#359)Daniel Svensson2016-05-295-37/+15
* | | | | | | | Corrects a backtickErez Zukerman2016-05-281-1/+1
* | | | | | | | Corrects linksErez Zukerman2016-05-281-5/+5
* | | | | | | | Adds a roadmap to the intro section of the docsErez Zukerman2016-05-281-2/+10
* | | | | | | | makes .SILENT (less verbose) by default - override with VERBOSE=1Jack Humbert2016-05-282-14/+4
* | | | | | | | process_record implementation (non-breaking for process_action ATM)Jack Humbert2016-05-282-0/+16
* | | | | | | | updates quantum template to prevent backlight conflictsJack Humbert2016-05-281-1/+1
* | | | | | | | brings alps64 up-to-date (needs testing)Jack Humbert2016-05-289-42/+44
| |/ / / / / / |/| | | | | |
* | | | | | | removes duplicate double quote and odd whitespaceJack Humbert2016-05-261-9/+1
|/ / / / / /
* | | | | | Merge pull request #352 from algernon/ergodox-ez/supercoderErez Zukerman2016-05-267-0/+965
|\ \ \ \ \ \
| * | | | | | ergodox_ez: Add a SuperCoder keymapGergely Nagy2016-05-267-0/+965
|/ / / / / /
* | | | | | Merge pull request #351 from adiabatic/masterErez Zukerman2016-05-254-1185/+1254
|\ \ \ \ \ \
| * | | | | | Add single and double quotes to numpad layerNathan Sharfi2016-05-252-1181/+1240
| * | | | | | Add double quote for everyone; update ZweihanderNathan Sharfi2016-05-253-4/+14
|/ / / / / /