summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* hmm?Nick Choi2017-05-301-1/+1
* Merge pull request #2 from qmk/masterNick Choi2017-05-3092-34/+5520
|\
| * Merge branch 'master' of https://github.com/qmk/qmk_firmwareJack Humbert2017-05-303-3/+21
| |\
| | * Merge pull request #1342 from priyadi/adafruit-mouse-buttonsJack Humbert2017-05-303-3/+21
| | |\
| | | * Adafruit Feather BLE / BLE Friend mouse buttons supportPriyadi Iman Nurcahyo2017-05-293-3/+21
| * | | make qmk bot do the hard workJack Humbert2017-05-301-2/+2
| |/ /
| * | Merge branch 'master' of https://github.com/qmk/qmk_firmwareJack Humbert2017-05-301-4/+6
| |\ \
| | * \ Merge pull request #1344 from qmk/jackhumbert-patch-1Jack Humbert2017-05-291-4/+6
| | |\ \
| | | * | Re-enable mouse buttonsJack Humbert2017-05-291-4/+6
| | |/ /
| * / / exclude PRsJack Humbert2017-05-302-5/+6
| |/ /
| * | no master needed on push maybeJack Humbert2017-05-291-1/+1
| * | Merge branch 'master' of https://github.com/qmk/qmk_firmwareJack Humbert2017-05-298-15/+360
| |\ \
| | * | Jokrik's Clueboard layout (#1340)Priyadi Iman Nurcahyo2017-05-292-0/+97
| | * | Merge pull request #1343 from Maartenwut/patch-1Jack Humbert2017-05-291-0/+18
| | |\ \
| | | * | Added SEND_STRING(); to the documentation.Maarten Dekkers2017-05-291-0/+18
| | * | | Merge pull request #1337 from fredizzimo/wsl_setupJack Humbert2017-05-295-15/+245
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Update windows 10 instructionsFred Sundvik2017-05-281-15/+22
| | | * | Create a symlink to qmk if requestedFred Sundvik2017-05-281-0/+13
| | | * | Add activate_wsl to .bashrcFred Sundvik2017-05-282-6/+31
| | | * | Fix symlink creationFred Sundvik2017-05-281-1/+1
| | | * | Use unzip instead of 7zipFred Sundvik2017-05-281-5/+5
| | | * | Actually install flip instead of just extractingFred Sundvik2017-05-282-3/+19
| | | * | Make symlink to utils and export programmer variablesFred Sundvik2017-05-282-1/+18
| | | * | Add install dependenciesFred Sundvik2017-05-281-4/+18
| | | * | Add prompt for re-downloading the utilsFred Sundvik2017-05-281-1/+13
| | | * | Add driver installationFred Sundvik2017-05-282-2/+69
| | | * | Add checks for cloning to the right dirFred Sundvik2017-05-281-23/+48
| | | * | Download windows flashing utils and driver_installerFred Sundvik2017-05-282-0/+34
| * | | | push to git urlJack Humbert2017-05-291-2/+2
| |/ / /
| * | | Merge branch 'master' of https://github.com/qmk/qmk_firmwareJack Humbert2017-05-291-1/+0
| |\ \ \
| | * \ \ Merge pull request #1341 from Dbroqua/patch-3Jack Humbert2017-05-291-1/+0
| | |\ \ \
| | | * | | Update Differences-from-TMK.mdDamien2017-05-291-1/+0
| | | | |/ | | | |/|
| * | / | get rid of folders in tarJack Humbert2017-05-291-0/+0
| |/ / /
| * | | Merge branch 'master' of https://github.com/qmk/qmk_firmwareJack Humbert2017-05-292-1/+3
| |\| |
| | * | Merge pull request #1338 from qmk/hf/prevent_stuck_modsErez Zukerman2017-05-282-1/+3
| | |\ \
| | | * | Adds prevent stuck modifiers to EZ defaultErez Zukerman2017-05-282-1/+3
| | |/ /
| * / / more than one en-file, and actually ignore docsJack Humbert2017-05-296-5/+5
| |/ /
| * | ignore docs, fix tag/hex pushingJack Humbert2017-05-283-3/+11
| * | Merge pull request #1336 from Dbroqua/patch-2Jack Humbert2017-05-281-1/+1
| |\ \ | | |/ | |/|
| | * Update Differences-from-TMK.mdDamien2017-05-281-1/+1
| |/
| * Merge pull request #1334 from fredizzimo/fix_faq_lineendingJack Humbert2017-05-281-237/+237
| |\
| | * Fix line endings in FAQ.mdFred Sundvik2017-05-281-237/+237
| |/
| * Updates book.jsonJack Humbert2017-05-271-1/+1
| * Updates book.jsonJack Humbert2017-05-271-1/+1
| * Updates book.jsonJack Humbert2017-05-271-1/+1
| * move book for gitbookJack Humbert2017-05-271-0/+0
| * Updates docs/book.jsonJack Humbert2017-05-271-0/+1
| * move old doc to docsJack Humbert2017-05-2716-0/+0
| * subtree docsJack Humbert2017-05-2747-0/+4807
| |\
| | * Merge pull request #5 from Maartenwut/patch-1Jack Humbert2017-05-271-2/+2
| | |\