summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #171 from NoahAndrews/restructure-documentationJack Humbert2016-03-044-2/+30
|\
| * 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 #170 from NoahAndrews/improve-windows-docsJack Humbert2016-03-043-4/+55
|\ \
| * | Fix link to MHV AVR ToolsNoah Andrews2016-03-021-1/+1
| * | Added documentation for new Windows scriptsNoah Andrews2016-03-021-17/+5
| * | Renamed scripts to show orderNoah Andrews2016-03-022-0/+0
| * | Added logging to setup scriptNoah Andrews2016-03-021-2/+18
| * | Removed unneeded lines from setup scriptNoah Andrews2016-03-022-6/+16
| * | Added Windows environment setup scriptNoah Andrews2016-02-261-0/+28
| * | Include MSYS directory in Windows pathNoah Andrews2016-02-261-1/+1
| * | Add script to setup the PATH variable on WindowsNoah Andrews2016-02-251-0/+9
* | | Merge pull request #165 from deepshitgoeshere/deepshitgoeshere-masterJack Humbert2016-03-043-1/+189
|\ \ \
| * | | Update PCB_GUIDE.mdLucas Hecht2016-02-271-1/+2
| * | | added "Troubleshooting" section to PCB guideLucas Hecht2016-02-271-0/+22
| * | | ignore dfu-programme.exe in commitsLucas Hecht2016-02-261-1/+3
| * | | 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 'jackhumbert-master'Lucas Hecht2016-02-258-1544/+1656
| |\ \ \
| | * | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware into jac...Lucas Hecht2016-02-257-1507/+1654
| | |\| |
| | * | | 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 #175 from NoahAndrews/fix-#174Jack Humbert2016-03-041-2/+1
|\ \ \ \
| * | | | Fix #174Noah Andrews2016-03-041-2/+1
|/ / / /
* | | | Merge pull request #172 from plgruener/pr1Jack Humbert2016-03-031-0/+19
|\ \ \ \ | |_|_|/ |/| | |
| * | | update neo keymapplgruener2016-03-031-0/+19
|/ / /
* | | 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
|\ \ \