summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Delete dfu-programmer.exedeepshitgoeshere2016-02-251-0/+0
|
* Delete dfu-programmer.exedeepshitgoeshere2016-02-251-0/+0
|
* Merge branch 'jackhumbert-master'Lucas Hecht2016-02-258-1544/+1656
|\
| * Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware into ↵Lucas Hecht2016-02-257-1507/+1654
| |\ | | | | | | | | | jackhumbert-master
| | * Merge pull request #158 from DidierLoiseau/eclipse-configJack Humbert2016-02-231-1/+6
| | |\ | | | | | | | | Add Eclipse settings files to .gitignore
| | | * Added eclipse settings files to .gitignoreDidier Loiseau2016-02-211-1/+6
| | | |
| | * | Merge pull request #159 from Keller-Laminar/patch-1Jack Humbert2016-02-221-1/+3
| | |\ \ | | | | | | | | | | Include Dvorak underscore and plus keys.
| | | * | Include Dvorak underscore and plus keys.Keller-Laminar2016-02-221-1/+3
| | |/ / | | | | | | | | There were previously no Dvorak specific underscore and plus key codes. For a keyboard like the Planck which has layers directly to shifted versions of special character keys you were unable to produce those characters using the Lower layer.
| | * | Merge pull request #157 from DidierLoiseau/typematrixJack Humbert2016-02-213-1505/+1483
| | |\ \ | | | |/ | | |/| Small fixes and improvements to tm2030 layout
| | | * Updated tm2030 keymap.hexDidier Loiseau2016-02-211-1482/+1476
| | | |
| | | * Fixed compilation warnings due to missing return statementsDidier Loiseau2016-02-211-1/+2
| | | |
| | | * FN macro: use layer_invert() instead of modifying layer_state directlyDidier Loiseau2016-02-071-20/+3
| | | | | | | | | | | | | | | | | | | | | | | | - fixes stuck keys from the temporary layers (see also jackhumbert/qmk_firmware#78) - removed the workaround for jackhumbert/qmk_firmware#81 (using layer_invert() fixes the problem)
| | | * Fixed inconsistency between comment and actual numeric layerDidier Loiseau2016-02-071-1/+1
| | | | | | | | | | | | - KC_INS should only be present on Fn layer
| | | * Fixed link to Magic doc in Dvorak sectionDidierLoiseau2016-02-071-1/+1
| | | |
| | * | Merge pull request #153 from spydon/xmonad_keymapJack Humbert2016-02-211-0/+64
| | |\ \ | | | | | | | | | | Keymap optimized for xmonad
| | | * | Added a keymap optimized for xmonadLukas Klingsbo2016-02-181-0/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The M(1) function changes layer temporarily (so that numbers can be used) and holds LGUI which makes it possible to easily change virtual screens and swap windows inbetween them.
| | * | | Merge pull request #155 from vincent-pochet/fr_ch_extra_keymapJack Humbert2016-02-211-0/+98
| | |\ \ \ | | | | | | | | | | | | Add extra keymap for swiss french keyboard
| | | * | | Add extra keymap for swiss french keyboardVincent Pochet2016-02-201-0/+98
| | |/ / /
| * / / / delete old keymap (keymap_eigen.c)Lucas Hecht2016-02-251-37/+2
|/ / / /
* / / / Added keymap "lucas.c"Lucas Hecht2016-02-244-0/+382
|/ / /
* | | Merge pull request #145 from gerbercj/feature/atreus_astarJack Humbert2016-02-176-19/+106
|\ \ \ | | | | | | | | Add support for Atreus running on A-Star
| * | | Change default controller for Atreus from Teensy2 to A-StarChris Gerber2016-02-173-10/+10
| | | |
| * | | Add support for Atreus running on A-StarChris Gerber2016-02-156-19/+106
| | | |
* | | | Merge pull request #141 from XenoBits/masterErez Zukerman2016-02-125-0/+1489
|\ \ \ \ | | | | | | | | | | Ergodox EZ new keymap for C# developers
| * | | | Another readme.md improvementMaxime Millet2016-02-121-9/+9
| | | | |
| * | | | Improved readmeMaxime Millet2016-02-121-10/+10
| | | | |
| * | | | Added C# developer keymapMaxime Millet2016-02-125-0/+1489
| | | | |
* | | | | Merge pull request #140 from lasko/masterJack Humbert2016-02-111-0/+134
|\ \ \ \ \ | | | | | | | | | | | | A slightly different default layout
| * | | | | Added pageup, pagedown, home, and end keysLasko Height2016-02-111-6/+6
| | | | | |
| * | | | | Added a Tenkey layer and moved the del keyLasko Height2016-02-111-5/+25
| | | | | |
| * | | | | Adding my initial layoutLasko Height2016-02-111-1/+1
| | | | | |
| * | | | | Adding my initial layoutLasko Height2016-02-111-0/+114
|/ / / / /
* | | | | Merge pull request #139 from ↵Erez Zukerman2016-02-115-0/+1470
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | joarau/norwegian-colemak-ergodox-with-norwegian-definitions Norwegian Colemak Ergodox and Norwegian key definitions
| * | | | | Norwegian Colemak Ergodox and Norwegian key definitionsjoar2016-02-115-0/+1470
| | | | | |
* | | | | | More tweaks to experimental layoutErez Zukerman2016-02-113-18/+19
| | | | | |
* | | | | | Merge branch 'master' of github.com:jackhumbert/qmk_firmwareErez Zukerman2016-02-1115-148/+4904
|\| | | | |
| * | | | | Merge pull request #138 from Willyfrog/masterErez Zukerman2016-02-104-0/+1666
| |\ \ \ \ \ | | |/ / / / | |/| | | | ergodox_ez for emacs + mac + altgr users
| | * | | | add imageGuillermo Vayá2016-02-101-0/+0
| | | | | |
| | * | | | added .hex fileGuillermo Vayá2016-02-101-0/+1472
| | | | | |
| | * | | | new emacs + osx + deadkeys layoutGuillermo Vayá2016-01-312-0/+194
| | | | | |
| * | | | | Merge pull request #137 from uzytkownik/masterErez Zukerman2016-02-103-0/+1770
| |\ \ \ \ \ | | |_|/ / / | |/| | | | Add mpiechotka ergodox ez keymap
| | * | | | Add mpiechotka ergodox ez keymapMaciej Piechotka2016-02-093-0/+1770
| |/ / / /
| * | | | Merge pull request #136 from cbbrowne/masterJack Humbert2016-02-081-148/+18
| |\ \ \ \ | | | | | | | | | | | | Random improvements
| | * | | | Eliminate switch statement by using contiguous character rangesChristopher Browne2016-02-081-152/+12
| | | | | |
| | * | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareChristopher Browne2016-02-0826-3455/+3814
| | |\ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge pull request #130 from jacobono/jacobonoErez Zukerman2016-02-087-0/+1450
| |\ \ \ \ \ | | | | | | | | | | | | | | Jacobono
| | * | | | | add hex fileDaniel Mijares2016-02-061-0/+1142
| | | | | | |
| | * | | | | my personal ergodox keymap layoutDaniel Mijares2016-02-066-0/+308
| | | | | | | | | | | | | | | | | | | | | | | | | | | | with pngs of layout and readme
| | | * | | | Add in XOR of lowest 8 bits of system timer to encourage more randomness of ↵Christopher Browne2016-02-061-147/+157
| | | | | | | | | | | | | | | | | | | | | | | | | | | | the digits/letters chosen
* | | | | | | Corrects typoErez Zukerman2016-02-081-1/+1
|/ / / / / /