summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1353 from 333fred/333fred-layoutJack Humbert2017-06-014-0/+528
|\
| * Update licensing on visualizer.cFredric Silberberg2017-05-311-14/+1
| * Updated readmeFredric Silberberg2017-05-312-7/+13
| * Added several new macrosFredric Silberberg2017-05-311-19/+63
| * Fixed numpad 0 layoutFredric Silberberg2017-05-312-3/+3
| * Use code blocks for keyboard layoutsFredric Silberberg2017-05-301-3/+13
| * Completed iteration 1 of my layoutFredric Silberberg2017-05-304-98/+306
| * Added initial keymap filesFredric Silberberg2017-05-303-0/+273
* | Merge pull request #1354 from shieldsd/tweaksJack Humbert2017-06-012-8/+10
|\ \
| * | Tweak reported power consumption to work with iOSDaniel Shields2017-06-012-8/+10
|/ /
* | Merge pull request #1348 from Dbroqua/masterJack Humbert2017-05-307-0/+242
|\ \ | |/ |/|
| * Merge remote-tracking branch 'origin/feature/DK60'dbroqua2017-05-302-3/+1
| |\
| | * - Updated copyrightdbroqua2017-05-302-3/+1
| * | Merge remote-tracking branch 'origin/feature/DK60'Damien Broqua2017-05-301-1/+3
| |\|
| | * - Updated readmeDamien Broqua2017-05-301-1/+3
| * | Merge remote-tracking branch 'origin/feature/DK60'Damien Broqua2017-05-307-0/+242
| |\|
| | * - Added Capslock/Esc ledDamien Broqua2017-05-303-35/+97
| | * - Some changes on DK60Damien Broqua2017-05-305-41/+37
| | * - Initial commit for branch DK60dbroqua2017-05-077-0/+184
* | | Merge pull request #1323 from nikchi/masterJack Humbert2017-05-305-22/+62
|\ \ \
| * | | 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
|\ \ \ \ \ \