Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of https://github.com/sboesebeck/qmk_firmware | Stephan Bösebeck | 2016-03-03 | 2 | -1483/+1481 |
|\ | |||||
| * | forgot F6 | Stephan Bösebeck | 2016-03-02 | 2 | -2/+2 |
| * | updated version, changed F-Key-Layout, minor change in code layer | Stephan Bösebeck | 2016-03-02 | 2 | -1481/+1479 |
| * | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | Stephan Bösebeck | 2016-03-02 | 14 | -1527/+1761 |
| |\ | |||||
* | \ | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | Stephan Bösebeck | 2016-03-03 | 1 | -1/+1 |
|\ \ \ | | |/ | |/| | |||||
| * | | Merge pull request #166 from kletord/fix_french_keymap | Jack Humbert | 2016-02-27 | 1 | -1/+1 |
| |\ \ | |||||
| | * | | Fix FR_RCBR declaration in keymap_french.h | Kévin Letord | 2016-02-27 | 1 | -1/+1 |
| |/ / | |||||
* | / | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | Stephan Bösebeck | 2016-02-24 | 13 | -1526/+1760 |
|\| | | |/ |/| | |||||
| * | Merge pull request #158 from DidierLoiseau/eclipse-config | Jack Humbert | 2016-02-23 | 1 | -1/+6 |
| |\ | |||||
| | * | Added eclipse settings files to .gitignore | Didier Loiseau | 2016-02-21 | 1 | -1/+6 |
| * | | Merge pull request #159 from Keller-Laminar/patch-1 | Jack Humbert | 2016-02-22 | 1 | -1/+3 |
| |\ \ | |||||
| | * | | Include Dvorak underscore and plus keys. | Keller-Laminar | 2016-02-22 | 1 | -1/+3 |
| |/ / | |||||
| * | | Merge pull request #157 from DidierLoiseau/typematrix | Jack Humbert | 2016-02-21 | 3 | -1505/+1483 |
| |\ \ | | |/ | |/| | |||||
| | * | Updated tm2030 keymap.hex | Didier Loiseau | 2016-02-21 | 1 | -1482/+1476 |
| | * | Fixed compilation warnings due to missing return statements | Didier Loiseau | 2016-02-21 | 1 | -1/+2 |
| | * | FN macro: use layer_invert() instead of modifying layer_state directly | Didier Loiseau | 2016-02-07 | 1 | -20/+3 |
| | * | Fixed inconsistency between comment and actual numeric layer | Didier Loiseau | 2016-02-07 | 1 | -1/+1 |
| | * | Fixed link to Magic doc in Dvorak section | DidierLoiseau | 2016-02-07 | 1 | -1/+1 |
| * | | Merge pull request #153 from spydon/xmonad_keymap | Jack Humbert | 2016-02-21 | 1 | -0/+64 |
| |\ \ | |||||
| | * | | Added a keymap optimized for xmonad | Lukas Klingsbo | 2016-02-18 | 1 | -0/+64 |
| * | | | Merge pull request #155 from vincent-pochet/fr_ch_extra_keymap | Jack Humbert | 2016-02-21 | 1 | -0/+98 |
| |\ \ \ | |||||
| | * | | | Add extra keymap for swiss french keyboard | Vincent Pochet | 2016-02-20 | 1 | -0/+98 |
| |/ / / | |||||
| * | | | Merge pull request #145 from gerbercj/feature/atreus_astar | Jack Humbert | 2016-02-17 | 6 | -19/+106 |
| |\ \ \ | |||||
| | * | | | Change default controller for Atreus from Teensy2 to A-Star | Chris Gerber | 2016-02-17 | 3 | -10/+10 |
| | * | | | Add support for Atreus running on A-Star | Chris Gerber | 2016-02-15 | 6 | -19/+106 |
* | | | | | testing moving the 6 to the left, having one key more on the right used for h... | Stephan Bösebeck | 2016-02-15 | 2 | -1519/+1561 |
|/ / / / | |||||
* | | | | Merge pull request #141 from XenoBits/master | Erez Zukerman | 2016-02-12 | 5 | -0/+1489 |
|\ \ \ \ | |||||
| * | | | | Another readme.md improvement | Maxime Millet | 2016-02-12 | 1 | -9/+9 |
| * | | | | Improved readme | Maxime Millet | 2016-02-12 | 1 | -10/+10 |
| * | | | | Added C# developer keymap | Maxime Millet | 2016-02-12 | 5 | -0/+1489 |
* | | | | | Merge pull request #140 from lasko/master | Jack Humbert | 2016-02-11 | 1 | -0/+134 |
|\ \ \ \ \ | |||||
| * | | | | | Added pageup, pagedown, home, and end keys | Lasko Height | 2016-02-11 | 1 | -6/+6 |
| * | | | | | Added a Tenkey layer and moved the del key | Lasko Height | 2016-02-11 | 1 | -5/+25 |
| * | | | | | Adding my initial layout | Lasko Height | 2016-02-11 | 1 | -1/+1 |
| * | | | | | Adding my initial layout | Lasko Height | 2016-02-11 | 1 | -0/+114 |
|/ / / / / | |||||
* | | | | | Merge pull request #139 from joarau/norwegian-colemak-ergodox-with-norwegian-... | Erez Zukerman | 2016-02-11 | 5 | -0/+1470 |
|\ \ \ \ \ | |||||
| * | | | | | Norwegian Colemak Ergodox and Norwegian key definitions | joar | 2016-02-11 | 5 | -0/+1470 |
* | | | | | | More tweaks to experimental layout | Erez Zukerman | 2016-02-11 | 3 | -18/+19 |
* | | | | | | Merge branch 'master' of github.com:jackhumbert/qmk_firmware | Erez Zukerman | 2016-02-11 | 15 | -148/+4904 |
|\| | | | | | |||||
| * | | | | | Merge pull request #138 from Willyfrog/master | Erez Zukerman | 2016-02-10 | 4 | -0/+1666 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| | * | | | | add image | Guillermo Vayá | 2016-02-10 | 1 | -0/+0 |
| | * | | | | added .hex file | Guillermo Vayá | 2016-02-10 | 1 | -0/+1472 |
| | * | | | | new emacs + osx + deadkeys layout | Guillermo Vayá | 2016-01-31 | 2 | -0/+194 |
| * | | | | | Merge pull request #137 from uzytkownik/master | Erez Zukerman | 2016-02-10 | 3 | -0/+1770 |
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| | * | | | | Add mpiechotka ergodox ez keymap | Maciej Piechotka | 2016-02-09 | 3 | -0/+1770 |
| |/ / / / | |||||
| * | | | | Merge pull request #136 from cbbrowne/master | Jack Humbert | 2016-02-08 | 1 | -148/+18 |
| |\ \ \ \ | |||||
| | * | | | | Eliminate switch statement by using contiguous character ranges | Christopher Browne | 2016-02-08 | 1 | -152/+12 |
| | * | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | Christopher Browne | 2016-02-08 | 26 | -3455/+3814 |
| | |\ \ \ \ | | |/ / / / | |/| | | | | |||||
| * | | | | | Merge pull request #130 from jacobono/jacobono | Erez Zukerman | 2016-02-08 | 7 | -0/+1450 |
| |\ \ \ \ \ | |||||
| | * | | | | | add hex file | Daniel Mijares | 2016-02-06 | 1 | -0/+1142 |