summaryrefslogtreecommitdiffstats
path: root/keyboard
Commit message (Expand)AuthorAgeFilesLines
* Delete keymap_eigen.cdeepshitgoeshere2016-02-251-184/+0
* Delete dfu-programmer.exedeepshitgoeshere2016-02-251-0/+0
* Delete dfu-programmer.exedeepshitgoeshere2016-02-251-0/+0
* Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware into jac...Lucas Hecht2016-02-254-1505/+1547
|\
| * Merge pull request #157 from DidierLoiseau/typematrixJack Humbert2016-02-213-1505/+1483
| |\
| | * 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
| | * Fixed inconsistency between comment and actual numeric layerDidier Loiseau2016-02-071-1/+1
| | * 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
| |\ \
| | * | Added a keymap optimized for xmonadLukas Klingsbo2016-02-181-0/+64
* | | | 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-175-19/+103
|\ \ \
| * | | 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-155-19/+103
* | | | Merge pull request #141 from XenoBits/masterErez Zukerman2016-02-125-0/+1489
|\ \ \ \
| * | | | 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
* | | | | 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 joarau/norwegian-colemak-ergodox-with-norwegian-...Erez Zukerman2016-02-114-0/+1429
|\ \ \ \ \
| * | | | | Norwegian Colemak Ergodox and Norwegian key definitionsjoar2016-02-114-0/+1429
* | | | | | More tweaks to experimental layoutErez Zukerman2016-02-113-18/+19
* | | | | | Merge branch 'master' of github.com:jackhumbert/qmk_firmwareErez Zukerman2016-02-1114-148/+4903
|\| | | | |
| * | | | | Merge pull request #138 from Willyfrog/masterErez Zukerman2016-02-104-0/+1666
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | 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
| * | | | | Add mpiechotka ergodox ez keymapMaciej Piechotka2016-02-093-0/+1770
| | |/ / / | |/| | |
| * | | | 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-0818-3256/+3689
| |\ \ \ \
| | * \ \ \ Merge pull request #130 from jacobono/jacobonoErez Zukerman2016-02-086-0/+1449
| | |\ \ \ \
| | | * | | | add hex fileDaniel Mijares2016-02-061-0/+1142
| | | * | | | my personal ergodox keymap layoutDaniel Mijares2016-02-065-0/+307
| * | | | | | Add in XOR of lowest 8 bits of system timer to encourage more randomness of t...Christopher Browne2016-02-061-147/+157
* | | | | | | Corrects typoErez Zukerman2016-02-081-1/+1
| |/ / / / / |/| | | | |
* | | | | | Updates documentation, adds Cmd/Win dual-function keyErez Zukerman2016-02-085-1443/+1098
| |_|_|/ / |/| | | |
* | | | | README changesJack Humbert2016-02-072-179/+2
* | | | | Merge branch 'master' of https://github.com/jackhumbert/tmk_keyboardJack Humbert2016-02-0720-4259/+5127
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge pull request #129 from cbbrowne/masterJack Humbert2016-02-051-57/+217
| |\| | |
| | * | | Remove obsolete commentsChristopher Browne2016-02-031-9/+0
| | * | | Comment things moreChristopher Browne2016-02-031-1/+2
| | * | | Random characters now working AOKChristopher Browne2016-02-031-14/+157
| | * | | Merge branch 'master' of github.com:cbbrowne/qmk_firmwareChristopher Browne2016-02-031-48/+60
| | |\ \ \
| | | * | | More experiments with mapping, notably adding in the random bitsChristopher Browne2016-02-031-48/+60