summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Clarified recommended Mac setup methodNoah Andrews2016-03-021-2/+4
* Updated README to point to new build guideNoah Andrews2016-03-021-2/+3
* Added Mac section (copy/pasted from PCB_GUIDE.md)Noah Andrews2016-03-021-0/+10
* Renamed handwriting guide to fit repository conventionNoah Andrews2016-03-021-0/+0
* Added placeholder for windows section of build guideNoah Andrews2016-03-022-2/+3
* Added Vagrant explanationNoah Andrews2016-03-021-1/+14
* Added stub BUILD_GUIDE.mdNoah Andrews2016-03-021-0/+1
* Renamed QUICK_START.md to VAGRANT_GUIDE.mdNoah Andrews2016-03-021-0/+0
* Merge pull request #166 from kletord/fix_french_keymapJack Humbert2016-02-271-1/+1
|\
| * Fix FR_RCBR declaration in keymap_french.hKévin Letord2016-02-271-1/+1
|/
* Merge pull request #158 from DidierLoiseau/eclipse-configJack Humbert2016-02-231-1/+6
|\
| * 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.Keller-Laminar2016-02-221-1/+3
|/ /
* | 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
* | | Merge pull request #155 from vincent-pochet/fr_ch_extra_keymapJack Humbert2016-02-211-0/+98
|\ \ \
| * | | Add extra keymap for swiss french keyboardVincent Pochet2016-02-201-0/+98
|/ / /
* | | Merge pull request #145 from gerbercj/feature/atreus_astarJack Humbert2016-02-176-19/+106
|\ \ \
| * | | 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
|\ \ \ \
| * | | | 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
|\ \ \ \ \
| * | | | | 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-115-0/+1470
|\ \ \ \ \
| * | | | | 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
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | 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 keymapMaciej Piechotka2016-02-093-0/+1770
| |/ / / /
| * | | | Merge pull request #136 from cbbrowne/masterJack Humbert2016-02-081-148/+18
| |\ \ \ \
| | * | | | 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
| |\ \ \ \ \