summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2016-02-24Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck13-1526/+1760
2016-02-23Merge pull request #158 from DidierLoiseau/eclipse-configJack Humbert1-1/+6
2016-02-22Merge pull request #159 from Keller-Laminar/patch-1Jack Humbert1-1/+3
2016-02-22Include Dvorak underscore and plus keys.Keller-Laminar1-1/+3
2016-02-21Merge pull request #157 from DidierLoiseau/typematrixJack Humbert3-1505/+1483
2016-02-21Added eclipse settings files to .gitignoreDidier Loiseau1-1/+6
2016-02-21Updated tm2030 keymap.hexDidier Loiseau1-1482/+1476
2016-02-21Fixed compilation warnings due to missing return statementsDidier Loiseau1-1/+2
2016-02-21Merge pull request #153 from spydon/xmonad_keymapJack Humbert1-0/+64
2016-02-21Merge pull request #155 from vincent-pochet/fr_ch_extra_keymapJack Humbert1-0/+98
2016-02-20Add extra keymap for swiss french keyboardVincent Pochet1-0/+98
2016-02-18Added a keymap optimized for xmonadLukas Klingsbo1-0/+64
2016-02-18Merge pull request #145 from gerbercj/feature/atreus_astarJack Humbert6-19/+106
2016-02-18Change default controller for Atreus from Teensy2 to A-StarChris Gerber3-10/+10
2016-02-16Add support for Atreus running on A-StarChris Gerber6-19/+106
2016-02-15testing moving the 6 to the left, having one key more on the right used for h...Stephan Bösebeck2-1519/+1561
2016-02-12Merge pull request #141 from XenoBits/masterErez Zukerman5-0/+1489
2016-02-12Another readme.md improvementMaxime Millet1-9/+9
2016-02-12Improved readmeMaxime Millet1-10/+10
2016-02-12Added C# developer keymapMaxime Millet5-0/+1489
2016-02-12Merge pull request #140 from lasko/masterJack Humbert1-0/+134
2016-02-12Added pageup, pagedown, home, and end keysLasko Height1-6/+6
2016-02-12Added a Tenkey layer and moved the del keyLasko Height1-5/+25
2016-02-12Adding my initial layoutLasko Height1-1/+1
2016-02-12Adding my initial layoutLasko Height1-0/+114
2016-02-12Merge pull request #139 from joarau/norwegian-colemak-ergodox-with-norwegian-...Erez Zukerman5-0/+1470
2016-02-11Norwegian Colemak Ergodox and Norwegian key definitionsjoar5-0/+1470
2016-02-11More tweaks to experimental layoutErez Zukerman3-18/+19
2016-02-11Merge branch 'master' of github.com:jackhumbert/qmk_firmwareErez Zukerman15-148/+4904
2016-02-10Merge pull request #138 from Willyfrog/masterErez Zukerman4-0/+1666
2016-02-10add imageGuillermo Vayá1-0/+0
2016-02-10Merge pull request #137 from uzytkownik/masterErez Zukerman3-0/+1770
2016-02-10added .hex fileGuillermo Vayá1-0/+1472
2016-02-10Add mpiechotka ergodox ez keymapMaciej Piechotka3-0/+1770
2016-02-08Merge pull request #136 from cbbrowne/masterJack Humbert1-148/+18
2016-02-08Eliminate switch statement by using contiguous character rangesChristopher Browne1-152/+12
2016-02-08Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareChristopher Browne26-3455/+3814
2016-02-08Corrects typoErez Zukerman1-1/+1
2016-02-08Merge pull request #130 from jacobono/jacobonoErez Zukerman7-0/+1450
2016-02-08Updates documentation, adds Cmd/Win dual-function keyErez Zukerman5-1443/+1098
2016-02-08Merge pull request #134 from dragon788/patch-2Jack Humbert1-1/+1
2016-02-08Added note about using avr_setup.shdragon7881-1/+1
2016-02-07FN macro: use layer_invert() instead of modifying layer_state directlyDidier Loiseau1-20/+3
2016-02-07Fixed inconsistency between comment and actual numeric layerDidier Loiseau1-1/+1
2016-02-07Fixed link to Magic doc in Dvorak sectionDidierLoiseau1-1/+1
2016-02-07advanced macro stuff for READMEJack Humbert1-4/+0
2016-02-07advanced macro stuff for READMEJack Humbert1-1/+1
2016-02-07advanced macro stuff for READMEJack Humbert1-9/+9
2016-02-07advanced macro stuff for READMEJack Humbert1-2/+66
2016-02-07README changesJack Humbert3-337/+4